From 64608d4edaedf20aaa17b7a6683d4d29680598ca Mon Sep 17 00:00:00 2001 From: Major Hayden Date: Tue, 10 Oct 2017 12:48:46 -0500 Subject: [PATCH] Avoid using gather_facts as a variable Ansible throws a warning when we use gather_facts as a variable. This patches changes the variable to osa_gather_facts to avoid warnings. Closes-Bug: 1722604 Change-Id: Ic0a46b93e1ba62bc8e99e2d0a279c361a168690b --- playbooks/common-playbooks/cinder.yml | 2 +- playbooks/common-playbooks/glance.yml | 2 +- playbooks/common-playbooks/neutron.yml | 2 +- playbooks/common-playbooks/nova.yml | 2 +- playbooks/etcd-install.yml | 2 +- playbooks/galera-install.yml | 4 ++-- playbooks/haproxy-install.yml | 4 ++-- playbooks/lxc-containers-create.yml | 2 +- playbooks/lxc-hosts-setup.yml | 2 +- playbooks/memcached-install.yml | 2 +- playbooks/openstack-hosts-setup.yml | 2 +- playbooks/os-aodh-install.yml | 2 +- playbooks/os-barbican-install.yml | 2 +- playbooks/os-ceilometer-install.yml | 2 +- playbooks/os-designate-install.yml | 2 +- playbooks/os-heat-install.yml | 2 +- playbooks/os-horizon-install.yml | 2 +- playbooks/os-ironic-install.yml | 2 +- playbooks/os-keystone-install.yml | 2 +- playbooks/os-molteniron-install.yml | 2 +- playbooks/os-octavia-install.yml | 2 +- playbooks/os-rally-install.yml | 2 +- playbooks/os-sahara-install.yml | 2 +- playbooks/os-swift-install.yml | 2 +- playbooks/os-swift-sync.yml | 2 +- playbooks/os-tacker-install.yml | 2 +- playbooks/os-tempest-install.yml | 2 +- playbooks/os-trove-install.yml | 2 +- playbooks/rabbitmq-install.yml | 2 +- playbooks/repo-build.yml | 2 +- playbooks/repo-server.yml | 2 +- playbooks/rsyslog-install.yml | 2 +- playbooks/security-hardening.yml | 2 +- playbooks/unbound-install.yml | 2 +- scripts/gate-check-commit.sh | 6 +++--- 35 files changed, 39 insertions(+), 39 deletions(-) diff --git a/playbooks/common-playbooks/cinder.yml b/playbooks/common-playbooks/cinder.yml index b4a1e5fd72..595bb54b1a 100644 --- a/playbooks/common-playbooks/cinder.yml +++ b/playbooks/common-playbooks/cinder.yml @@ -16,7 +16,7 @@ - name: Install cinder services hosts: "{{ cinder_hosts }}" serial: "{{ cinder_serial }}" - gather_facts: "{{ gather_facts | default(True) }}" + gather_facts: "{{ osa_gather_facts | default(True) }}" user: root environment: "{{ deployment_environment_variables | default({}) }}" tags: diff --git a/playbooks/common-playbooks/glance.yml b/playbooks/common-playbooks/glance.yml index 7132bba21e..97ee7ef9c2 100644 --- a/playbooks/common-playbooks/glance.yml +++ b/playbooks/common-playbooks/glance.yml @@ -16,7 +16,7 @@ - name: Install glance services hosts: "{{ glance_hosts }}" serial: "{{ glance_serial }}" - gather_facts: "{{ gather_facts | default(True) }}" + gather_facts: "{{ osa_gather_facts | default(True) }}" user: root environment: "{{ deployment_environment_variables | default({}) }}" tags: diff --git a/playbooks/common-playbooks/neutron.yml b/playbooks/common-playbooks/neutron.yml index 3a90d2886e..6fe01323ca 100644 --- a/playbooks/common-playbooks/neutron.yml +++ b/playbooks/common-playbooks/neutron.yml @@ -16,7 +16,7 @@ - name: Install neutron services hosts: "{{ neutron_hosts }}" serial: "{{ neutron_serial }}" - gather_facts: "{{ gather_facts | default(True) }}" + gather_facts: "{{ osa_gather_facts | default(True) }}" user: root environment: "{{ deployment_environment_variables | default({}) }}" tags: diff --git a/playbooks/common-playbooks/nova.yml b/playbooks/common-playbooks/nova.yml index b1f533f923..c16a6e00cc 100644 --- a/playbooks/common-playbooks/nova.yml +++ b/playbooks/common-playbooks/nova.yml @@ -16,7 +16,7 @@ - name: Install nova services hosts: "{{ nova_hosts }}" serial: "{{ nova_serial }}" - gather_facts: "{{ gather_facts | default(True) }}" + gather_facts: "{{ osa_gather_facts | default(True) }}" user: root environment: "{{ deployment_environment_variables | default({}) }}" vars_files: diff --git a/playbooks/etcd-install.yml b/playbooks/etcd-install.yml index 05c18839ce..b8ca67c3e8 100644 --- a/playbooks/etcd-install.yml +++ b/playbooks/etcd-install.yml @@ -15,7 +15,7 @@ - name: Install etcd server cluster hosts: etcd_all - gather_facts: "{{ gather_facts | default(True) }}" + gather_facts: "{{ osa_gather_facts | default(True) }}" max_fail_percentage: 20 user: root pre_tasks: diff --git a/playbooks/galera-install.yml b/playbooks/galera-install.yml index 5f1c634e4d..015db393ba 100644 --- a/playbooks/galera-install.yml +++ b/playbooks/galera-install.yml @@ -15,7 +15,7 @@ - name: Galera container config hosts: galera_all - gather_facts: "{{ gather_facts | default(True) }}" + gather_facts: "{{ osa_gather_facts | default(True) }}" serial: 1 max_fail_percentage: 0 user: root @@ -43,7 +43,7 @@ - name: Install galera server hosts: galera_all - gather_facts: "{{ gather_facts | default(True) }}" + gather_facts: "{{ osa_gather_facts | default(True) }}" serial: 1 max_fail_percentage: 20 user: root diff --git a/playbooks/haproxy-install.yml b/playbooks/haproxy-install.yml index 3a0f8e3227..4fe84c5477 100644 --- a/playbooks/haproxy-install.yml +++ b/playbooks/haproxy-install.yml @@ -15,7 +15,7 @@ - name: haproxy base config hosts: haproxy - gather_facts: "{{ gather_facts | default(True) }}" + gather_facts: "{{ osa_gather_facts | default(True) }}" user: root pre_tasks: - include: common-tasks/os-lxc-container-setup.yml @@ -42,7 +42,7 @@ - name: Install haproxy hosts: haproxy - gather_facts: "{{ gather_facts | default(True) }}" + gather_facts: "{{ osa_gather_facts | default(True) }}" max_fail_percentage: 20 user: root pre_tasks: diff --git a/playbooks/lxc-containers-create.yml b/playbooks/lxc-containers-create.yml index a64b9543b5..16b244ccfa 100644 --- a/playbooks/lxc-containers-create.yml +++ b/playbooks/lxc-containers-create.yml @@ -15,7 +15,7 @@ - name: Gather lxc container host facts hosts: "{{ lxc_host_group | default('lxc_hosts')}}" - gather_facts: "{{ gather_facts | default(True) }}" + gather_facts: "{{ osa_gather_facts | default(True) }}" - name: Create container(s) hosts: "{{ container_group|default('all_containers') }}" diff --git a/playbooks/lxc-hosts-setup.yml b/playbooks/lxc-hosts-setup.yml index 6db3cc0541..734b10d8bd 100644 --- a/playbooks/lxc-hosts-setup.yml +++ b/playbooks/lxc-hosts-setup.yml @@ -15,7 +15,7 @@ - name: Basic lxc host setup hosts: "{{ lxc_host_group | default('lxc_hosts')}}" - gather_facts: "{{ gather_facts | default(True) }}" + gather_facts: "{{ osa_gather_facts | default(True) }}" max_fail_percentage: 20 user: root pre_tasks: diff --git a/playbooks/memcached-install.yml b/playbooks/memcached-install.yml index 0c5496c43b..95559c9a42 100644 --- a/playbooks/memcached-install.yml +++ b/playbooks/memcached-install.yml @@ -15,7 +15,7 @@ - name: Install memcached hosts: memcached - gather_facts: "{{ gather_facts | default(True) }}" + gather_facts: "{{ osa_gather_facts | default(True) }}" max_fail_percentage: 20 user: root pre_tasks: diff --git a/playbooks/openstack-hosts-setup.yml b/playbooks/openstack-hosts-setup.yml index 3f3134cc7f..178f6f7de1 100644 --- a/playbooks/openstack-hosts-setup.yml +++ b/playbooks/openstack-hosts-setup.yml @@ -38,7 +38,7 @@ - name: Basic host setup hosts: "{{ openstack_host_group|default('hosts') }}" - gather_facts: "{{ gather_facts | default(True) }}" + gather_facts: "{{ osa_gather_facts | default(True) }}" max_fail_percentage: 20 user: root pre_tasks: diff --git a/playbooks/os-aodh-install.yml b/playbooks/os-aodh-install.yml index 3353b14474..f68aafc2a7 100644 --- a/playbooks/os-aodh-install.yml +++ b/playbooks/os-aodh-install.yml @@ -15,7 +15,7 @@ - name: Install the aodh components hosts: aodh_all - gather_facts: "{{ gather_facts | default(True) }}" + gather_facts: "{{ osa_gather_facts | default(True) }}" max_fail_percentage: 20 user: root pre_tasks: diff --git a/playbooks/os-barbican-install.yml b/playbooks/os-barbican-install.yml index 8530113b6a..e3ba5837c5 100644 --- a/playbooks/os-barbican-install.yml +++ b/playbooks/os-barbican-install.yml @@ -15,7 +15,7 @@ - name: Installation and setup of barbican hosts: barbican_all - gather_facts: "{{ gather_facts | default(True) }}" + gather_facts: "{{ osa_gather_facts | default(True) }}" max_fail_percentage: 20 user: root pre_tasks: diff --git a/playbooks/os-ceilometer-install.yml b/playbooks/os-ceilometer-install.yml index 884fce10ee..1bb42e48ae 100644 --- a/playbooks/os-ceilometer-install.yml +++ b/playbooks/os-ceilometer-install.yml @@ -15,7 +15,7 @@ - name: Install the ceilometer components hosts: ceilometer_all - gather_facts: "{{ gather_facts | default(True) }}" + gather_facts: "{{ osa_gather_facts | default(True) }}" max_fail_percentage: 20 user: root pre_tasks: diff --git a/playbooks/os-designate-install.yml b/playbooks/os-designate-install.yml index e612856371..54cf31fc47 100644 --- a/playbooks/os-designate-install.yml +++ b/playbooks/os-designate-install.yml @@ -18,7 +18,7 @@ - name: Install designate server hosts: designate_all - gather_facts: "{{ gather_facts | default(True) }}" + gather_facts: "{{ osa_gather_facts | default(True) }}" user: root pre_tasks: - include: common-tasks/os-lxc-container-setup.yml diff --git a/playbooks/os-heat-install.yml b/playbooks/os-heat-install.yml index 314a266bb2..2a768c4b89 100644 --- a/playbooks/os-heat-install.yml +++ b/playbooks/os-heat-install.yml @@ -15,7 +15,7 @@ - name: Install heat server hosts: heat_all - gather_facts: "{{ gather_facts | default(True) }}" + gather_facts: "{{ osa_gather_facts | default(True) }}" max_fail_percentage: 20 user: root pre_tasks: diff --git a/playbooks/os-horizon-install.yml b/playbooks/os-horizon-install.yml index 6627dbcd48..4c17dd0eb2 100644 --- a/playbooks/os-horizon-install.yml +++ b/playbooks/os-horizon-install.yml @@ -15,7 +15,7 @@ - name: Install horizon server hosts: horizon_all - gather_facts: "{{ gather_facts | default(True) }}" + gather_facts: "{{ osa_gather_facts | default(True) }}" max_fail_percentage: 20 user: root pre_tasks: diff --git a/playbooks/os-ironic-install.yml b/playbooks/os-ironic-install.yml index ef8c6972fe..3dda03db7d 100644 --- a/playbooks/os-ironic-install.yml +++ b/playbooks/os-ironic-install.yml @@ -15,7 +15,7 @@ - name: Installation and setup of Ironic hosts: ironic_all - gather_facts: "{{ gather_facts | default(True) }}" + gather_facts: "{{ osa_gather_facts | default(True) }}" user: root pre_tasks: - include: common-tasks/os-lxc-container-setup.yml diff --git a/playbooks/os-keystone-install.yml b/playbooks/os-keystone-install.yml index 7e25967a61..789773d8a6 100644 --- a/playbooks/os-keystone-install.yml +++ b/playbooks/os-keystone-install.yml @@ -61,7 +61,7 @@ - name: Installation and setup of Keystone hosts: keystone_all serial: "{{ keystone_serial | default(['1', '100%']) }}" - gather_facts: "{{ gather_facts | default(True) }}" + gather_facts: "{{ osa_gather_facts | default(True) }}" max_fail_percentage: 20 user: root environment: "{{ deployment_environment_variables | default({}) }}" diff --git a/playbooks/os-molteniron-install.yml b/playbooks/os-molteniron-install.yml index 2a47393f71..ff820f7b62 100644 --- a/playbooks/os-molteniron-install.yml +++ b/playbooks/os-molteniron-install.yml @@ -15,7 +15,7 @@ - name: Installation and setup of molteniron hosts: molteniron_all - gather_facts: "{{ gather_facts | default(True) }}" + gather_facts: "{{ osa_gather_facts | default(True) }}" user: root pre_tasks: - include: common-tasks/os-lxc-container-setup.yml diff --git a/playbooks/os-octavia-install.yml b/playbooks/os-octavia-install.yml index c0e7770f50..17ca53480a 100644 --- a/playbooks/os-octavia-install.yml +++ b/playbooks/os-octavia-install.yml @@ -15,7 +15,7 @@ - name: Install octavia server hosts: octavia_all - gather_facts: "{{ gather_facts | default(True) }}" + gather_facts: "{{ osa_gather_facts | default(True) }}" max_fail_percentage: 20 user: root pre_tasks: diff --git a/playbooks/os-rally-install.yml b/playbooks/os-rally-install.yml index 549c4d0006..2fef255d29 100644 --- a/playbooks/os-rally-install.yml +++ b/playbooks/os-rally-install.yml @@ -15,7 +15,7 @@ - name: Installation and setup of Rally hosts: utility_all - gather_facts: "{{ gather_facts | default(True) }}" + gather_facts: "{{ osa_gather_facts | default(True) }}" user: root pre_tasks: - include: common-tasks/unbound-clients.yml diff --git a/playbooks/os-sahara-install.yml b/playbooks/os-sahara-install.yml index dc4a9dd544..7ced0e93be 100644 --- a/playbooks/os-sahara-install.yml +++ b/playbooks/os-sahara-install.yml @@ -13,7 +13,7 @@ - name: Install sahara server hosts: sahara_all - gather_facts: "{{ gather_facts | default(True) }}" + gather_facts: "{{ osa_gather_facts | default(True) }}" user: root pre_tasks: - include: common-tasks/os-lxc-container-setup.yml diff --git a/playbooks/os-swift-install.yml b/playbooks/os-swift-install.yml index b83c550835..5c1df366f3 100644 --- a/playbooks/os-swift-install.yml +++ b/playbooks/os-swift-install.yml @@ -15,7 +15,7 @@ - name: Installation and setup of Swift hosts: swift_all:swift_remote_all - gather_facts: "{{ gather_facts | default(True) }}" + gather_facts: "{{ osa_gather_facts | default(True) }}" max_fail_percentage: 20 user: root pre_tasks: diff --git a/playbooks/os-swift-sync.yml b/playbooks/os-swift-sync.yml index 79d832d210..bd7b4d4ff8 100644 --- a/playbooks/os-swift-sync.yml +++ b/playbooks/os-swift-sync.yml @@ -17,7 +17,7 @@ # The services need to be installed first though. - name: Synchronisation of swift ring and ssh keys hosts: swift_all:swift_remote_all - gather_facts: "{{ gather_facts | default(True) }}" + gather_facts: "{{ osa_gather_facts | default(True) }}" max_fail_percentage: 20 user: root roles: diff --git a/playbooks/os-tacker-install.yml b/playbooks/os-tacker-install.yml index dd9659516e..b35ea18b69 100644 --- a/playbooks/os-tacker-install.yml +++ b/playbooks/os-tacker-install.yml @@ -15,7 +15,7 @@ - name: Install the tacker components hosts: tacker_all - gather_facts: "{{ gather_facts | default(True) }}" + gather_facts: "{{ osa_gather_facts | default(True) }}" max_fail_percentage: 20 user: root pre_tasks: diff --git a/playbooks/os-tempest-install.yml b/playbooks/os-tempest-install.yml index 55b0d095b6..c438358044 100644 --- a/playbooks/os-tempest-install.yml +++ b/playbooks/os-tempest-install.yml @@ -15,7 +15,7 @@ - name: Installation and setup of Tempest hosts: utility_all[0] - gather_facts: "{{ gather_facts | default(True) }}" + gather_facts: "{{ osa_gather_facts | default(True) }}" max_fail_percentage: 20 user: root roles: diff --git a/playbooks/os-trove-install.yml b/playbooks/os-trove-install.yml index 6612841b97..3e0462eaf1 100644 --- a/playbooks/os-trove-install.yml +++ b/playbooks/os-trove-install.yml @@ -18,7 +18,7 @@ - name: Install trove server hosts: trove_all - gather_facts: "{{ gather_facts | default(True) }}" + gather_facts: "{{ osa_gather_facts | default(True) }}" user: root pre_tasks: - include: common-tasks/os-lxc-container-setup.yml diff --git a/playbooks/rabbitmq-install.yml b/playbooks/rabbitmq-install.yml index adb5fb430e..748c404f28 100644 --- a/playbooks/rabbitmq-install.yml +++ b/playbooks/rabbitmq-install.yml @@ -16,7 +16,7 @@ - name: Create and configure rabbitmq container hosts: "{{ rabbitmq_host_group | default('rabbitmq_all') }}" serial: 1 - gather_facts: "{{ gather_facts | default(True) }}" + gather_facts: "{{ osa_gather_facts | default(True) }}" max_fail_percentage: 0 user: root pre_tasks: diff --git a/playbooks/repo-build.yml b/playbooks/repo-build.yml index cfa6117a06..a6b35d2227 100644 --- a/playbooks/repo-build.yml +++ b/playbooks/repo-build.yml @@ -44,7 +44,7 @@ - name: Build new repo packages for a given release hosts: repo_masters - gather_facts: "{{ gather_facts | default(True) }}" + gather_facts: "{{ osa_gather_facts | default(True) }}" any_errors_fatal: true user: root serial: 1 diff --git a/playbooks/repo-server.yml b/playbooks/repo-server.yml index d32c1eb2a6..25b0a09de2 100644 --- a/playbooks/repo-server.yml +++ b/playbooks/repo-server.yml @@ -15,7 +15,7 @@ - name: Setup repo servers hosts: repo_all - gather_facts: "{{ gather_facts | default(True) }}" + gather_facts: "{{ osa_gather_facts | default(True) }}" max_fail_percentage: 20 user: root pre_tasks: diff --git a/playbooks/rsyslog-install.yml b/playbooks/rsyslog-install.yml index f64bd0c7be..74d72c73c9 100644 --- a/playbooks/rsyslog-install.yml +++ b/playbooks/rsyslog-install.yml @@ -15,7 +15,7 @@ - name: Install rsyslog hosts: rsyslog - gather_facts: "{{ gather_facts | default(True) }}" + gather_facts: "{{ osa_gather_facts | default(True) }}" max_fail_percentage: 20 user: root pre_tasks: diff --git a/playbooks/security-hardening.yml b/playbooks/security-hardening.yml index 8f399c5683..156aca8e38 100644 --- a/playbooks/security-hardening.yml +++ b/playbooks/security-hardening.yml @@ -19,7 +19,7 @@ - name: Apply security hardening configurations hosts: "{{ security_host_group|default('hosts') }}" - gather_facts: "{{ gather_facts | default(True) }}" + gather_facts: "{{ osa_gather_facts | default(True) }}" user: root roles: - role: "ansible-hardening" diff --git a/playbooks/unbound-install.yml b/playbooks/unbound-install.yml index 03580ddff5..2b8d09bd39 100644 --- a/playbooks/unbound-install.yml +++ b/playbooks/unbound-install.yml @@ -16,7 +16,7 @@ - name: Install unbound DNS resolvers hosts: - unbound - gather_facts: "{{ gather_facts | default(True) }}" + gather_facts: "{{ osa_gather_facts | default(True) }}" user: root pre_tasks: - include: common-tasks/os-log-dir-setup.yml diff --git a/scripts/gate-check-commit.sh b/scripts/gate-check-commit.sh index 371ca3426e..3460bfc86c 100755 --- a/scripts/gate-check-commit.sh +++ b/scripts/gate-check-commit.sh @@ -173,7 +173,7 @@ pushd "${OSA_CLONE_DIR}/playbooks" # Prepare the hosts export ANSIBLE_LOG_PATH="${ANSIBLE_LOG_DIR}/setup-hosts.log" - openstack-ansible setup-hosts.yml -e gather_facts=False + openstack-ansible setup-hosts.yml -e osa_gather_facts=False # Log some data about the instance and the rest of the system log_instance_info @@ -185,14 +185,14 @@ pushd "${OSA_CLONE_DIR}/playbooks" # Prepare the infrastructure export ANSIBLE_LOG_PATH="${ANSIBLE_LOG_DIR}/setup-infrastructure.log" - openstack-ansible setup-infrastructure.yml -e gather_facts=False + openstack-ansible setup-infrastructure.yml -e osa_gather_facts=False # Log some data about the instance and the rest of the system log_instance_info # Setup OpenStack export ANSIBLE_LOG_PATH="${ANSIBLE_LOG_DIR}/setup-openstack.log" - openstack-ansible setup-openstack.yml -e gather_facts=False + openstack-ansible setup-openstack.yml -e osa_gather_facts=False # Log some data about the instance and the rest of the system log_instance_info