From bd0792397bd1032886a40db66fe013d923f8c47b Mon Sep 17 00:00:00 2001
From: Matt Martz <matt@sivel.net>
Date: Tue, 16 Apr 2019 20:28:01 -0500
Subject: [PATCH] Fix uri tasks (#55403)

* Fix uri tasks

* Fix apt task to install firewalld

* Fix invalid option in package_facts - ci_complete
---
 test/integration/targets/firewalld/tasks/main.yml         | 2 +-
 test/integration/targets/package_facts/tasks/main.yml     | 8 ++++----
 test/integration/targets/rabbitmq_lookup/tasks/ubuntu.yml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/integration/targets/firewalld/tasks/main.yml b/test/integration/targets/firewalld/tasks/main.yml
index 37406458345..b441d6f2879 100644
--- a/test/integration/targets/firewalld/tasks/main.yml
+++ b/test/integration/targets/firewalld/tasks/main.yml
@@ -21,7 +21,7 @@
     - name: Ensure firewalld is installed
       package:
         name: firewalld
-        state: installed
+        state: present
       # This doesn't work for CentOS 6 because firewalld doesn't exist in CentOS6
 
     - name: Check to make sure the firewalld python module is available.
diff --git a/test/integration/targets/package_facts/tasks/main.yml b/test/integration/targets/package_facts/tasks/main.yml
index 8dec1649953..0ca00a42e5a 100644
--- a/test/integration/targets/package_facts/tasks/main.yml
+++ b/test/integration/targets/package_facts/tasks/main.yml
@@ -19,11 +19,11 @@
 - name: Prep package_fact tests - Debian Family
   block:
     - name: install python apt bindings - python2
-      package: name="python-apt" state=installed
+      package: name="python-apt" state=present
       when: ansible_python.version.major|int == 2
 
     - name: install python apt bindings - python3
-      package: name="python3-apt" state=installed
+      package: name="python3-apt" state=present
       when: ansible_python.version.major|int == 3
 
     - name: Gather package facts
@@ -49,11 +49,11 @@
 - name: Run package_fact tests - SUSE/OpenSUSE Family
   block:
     - name: install python rpm bindings - python2
-      package: name="rpm-python" state=installed
+      package: name="rpm-python" state=present
       when: ansible_python.version.major|int == 2
 
     - name: install python rpm bindings - python3
-      package: name="python3-rpm" state=installed
+      package: name="python3-rpm" state=present
       when: ansible_python.version.major|int == 3
 
     - name: Gather package facts
diff --git a/test/integration/targets/rabbitmq_lookup/tasks/ubuntu.yml b/test/integration/targets/rabbitmq_lookup/tasks/ubuntu.yml
index 4a339bb1f41..3b007edecc9 100644
--- a/test/integration/targets/rabbitmq_lookup/tasks/ubuntu.yml
+++ b/test/integration/targets/rabbitmq_lookup/tasks/ubuntu.yml
@@ -75,9 +75,9 @@
     password: guest
     force_basic_auth: yes
     return_content: yes
-    register: post_data
     headers:
       Content-Type: "application/json"
+  register: post_data
 
 
 - name: Post test message to the exchange (json)
@@ -89,9 +89,9 @@
     password: guest
     force_basic_auth: yes
     return_content: yes
-    register: post_data_json
     headers:
       Content-Type: "application/json"
+  register: post_data_json
 
 - name: Test retrieve messages
   set_fact: