Merge "Avoid using gather_facts as a variable"

This commit is contained in:
Zuul 2017-10-17 12:24:13 +00:00 committed by Gerrit Code Review
commit 6bff605c62
35 changed files with 39 additions and 39 deletions

View File

@ -16,7 +16,7 @@
- name: Install cinder services - name: Install cinder services
hosts: "{{ cinder_hosts }}" hosts: "{{ cinder_hosts }}"
serial: "{{ cinder_serial }}" serial: "{{ cinder_serial }}"
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
user: root user: root
environment: "{{ deployment_environment_variables | default({}) }}" environment: "{{ deployment_environment_variables | default({}) }}"
tags: tags:

View File

@ -16,7 +16,7 @@
- name: Install glance services - name: Install glance services
hosts: "{{ glance_hosts }}" hosts: "{{ glance_hosts }}"
serial: "{{ glance_serial }}" serial: "{{ glance_serial }}"
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
user: root user: root
environment: "{{ deployment_environment_variables | default({}) }}" environment: "{{ deployment_environment_variables | default({}) }}"
tags: tags:

View File

@ -16,7 +16,7 @@
- name: Install neutron services - name: Install neutron services
hosts: "{{ neutron_hosts }}" hosts: "{{ neutron_hosts }}"
serial: "{{ neutron_serial }}" serial: "{{ neutron_serial }}"
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
user: root user: root
environment: "{{ deployment_environment_variables | default({}) }}" environment: "{{ deployment_environment_variables | default({}) }}"
tags: tags:

View File

@ -16,7 +16,7 @@
- name: Install nova services - name: Install nova services
hosts: "{{ nova_hosts }}" hosts: "{{ nova_hosts }}"
serial: "{{ nova_serial }}" serial: "{{ nova_serial }}"
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
user: root user: root
environment: "{{ deployment_environment_variables | default({}) }}" environment: "{{ deployment_environment_variables | default({}) }}"
vars_files: vars_files:

View File

@ -15,7 +15,7 @@
- name: Install etcd server cluster - name: Install etcd server cluster
hosts: etcd_all hosts: etcd_all
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
max_fail_percentage: 20 max_fail_percentage: 20
user: root user: root
pre_tasks: pre_tasks:

View File

@ -15,7 +15,7 @@
- name: Galera container config - name: Galera container config
hosts: galera_all hosts: galera_all
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
serial: 1 serial: 1
max_fail_percentage: 0 max_fail_percentage: 0
user: root user: root
@ -43,7 +43,7 @@
- name: Install galera server - name: Install galera server
hosts: galera_all hosts: galera_all
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
serial: 1 serial: 1
max_fail_percentage: 20 max_fail_percentage: 20
user: root user: root

View File

@ -15,7 +15,7 @@
- name: haproxy base config - name: haproxy base config
hosts: haproxy hosts: haproxy
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
user: root user: root
pre_tasks: pre_tasks:
- include: common-tasks/os-lxc-container-setup.yml - include: common-tasks/os-lxc-container-setup.yml
@ -42,7 +42,7 @@
- name: Install haproxy - name: Install haproxy
hosts: haproxy hosts: haproxy
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
max_fail_percentage: 20 max_fail_percentage: 20
user: root user: root
pre_tasks: pre_tasks:

View File

@ -15,7 +15,7 @@
- name: Gather lxc container host facts - name: Gather lxc container host facts
hosts: "{{ lxc_host_group | default('lxc_hosts')}}" hosts: "{{ lxc_host_group | default('lxc_hosts')}}"
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
- name: Create container(s) - name: Create container(s)
hosts: "{{ container_group|default('all_containers') }}" hosts: "{{ container_group|default('all_containers') }}"

View File

@ -15,7 +15,7 @@
- name: Basic lxc host setup - name: Basic lxc host setup
hosts: "{{ lxc_host_group | default('lxc_hosts')}}" hosts: "{{ lxc_host_group | default('lxc_hosts')}}"
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
max_fail_percentage: 20 max_fail_percentage: 20
user: root user: root
pre_tasks: pre_tasks:

View File

@ -15,7 +15,7 @@
- name: Install memcached - name: Install memcached
hosts: memcached hosts: memcached
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
max_fail_percentage: 20 max_fail_percentage: 20
user: root user: root
pre_tasks: pre_tasks:

View File

@ -38,7 +38,7 @@
- name: Basic host setup - name: Basic host setup
hosts: "{{ openstack_host_group|default('hosts') }}" hosts: "{{ openstack_host_group|default('hosts') }}"
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
max_fail_percentage: 20 max_fail_percentage: 20
user: root user: root
pre_tasks: pre_tasks:

View File

@ -15,7 +15,7 @@
- name: Install the aodh components - name: Install the aodh components
hosts: aodh_all hosts: aodh_all
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
max_fail_percentage: 20 max_fail_percentage: 20
user: root user: root
pre_tasks: pre_tasks:

View File

@ -15,7 +15,7 @@
- name: Installation and setup of barbican - name: Installation and setup of barbican
hosts: barbican_all hosts: barbican_all
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
max_fail_percentage: 20 max_fail_percentage: 20
user: root user: root
pre_tasks: pre_tasks:

View File

@ -15,7 +15,7 @@
- name: Install the ceilometer components - name: Install the ceilometer components
hosts: ceilometer_all hosts: ceilometer_all
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
max_fail_percentage: 20 max_fail_percentage: 20
user: root user: root
pre_tasks: pre_tasks:

View File

@ -18,7 +18,7 @@
- name: Install designate server - name: Install designate server
hosts: designate_all hosts: designate_all
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
user: root user: root
pre_tasks: pre_tasks:
- include: common-tasks/os-lxc-container-setup.yml - include: common-tasks/os-lxc-container-setup.yml

View File

@ -15,7 +15,7 @@
- name: Install heat server - name: Install heat server
hosts: heat_all hosts: heat_all
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
max_fail_percentage: 20 max_fail_percentage: 20
user: root user: root
pre_tasks: pre_tasks:

View File

@ -15,7 +15,7 @@
- name: Install horizon server - name: Install horizon server
hosts: horizon_all hosts: horizon_all
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
max_fail_percentage: 20 max_fail_percentage: 20
user: root user: root
pre_tasks: pre_tasks:

View File

@ -15,7 +15,7 @@
- name: Installation and setup of Ironic - name: Installation and setup of Ironic
hosts: ironic_all hosts: ironic_all
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
user: root user: root
pre_tasks: pre_tasks:
- include: common-tasks/os-lxc-container-setup.yml - include: common-tasks/os-lxc-container-setup.yml

View File

@ -61,7 +61,7 @@
- name: Installation and setup of Keystone - name: Installation and setup of Keystone
hosts: keystone_all hosts: keystone_all
serial: "{{ keystone_serial | default(['1', '100%']) }}" serial: "{{ keystone_serial | default(['1', '100%']) }}"
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
max_fail_percentage: 20 max_fail_percentage: 20
user: root user: root
environment: "{{ deployment_environment_variables | default({}) }}" environment: "{{ deployment_environment_variables | default({}) }}"

View File

@ -15,7 +15,7 @@
- name: Installation and setup of molteniron - name: Installation and setup of molteniron
hosts: molteniron_all hosts: molteniron_all
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
user: root user: root
pre_tasks: pre_tasks:
- include: common-tasks/os-lxc-container-setup.yml - include: common-tasks/os-lxc-container-setup.yml

View File

@ -15,7 +15,7 @@
- name: Install octavia server - name: Install octavia server
hosts: octavia_all hosts: octavia_all
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
max_fail_percentage: 20 max_fail_percentage: 20
user: root user: root
pre_tasks: pre_tasks:

View File

@ -15,7 +15,7 @@
- name: Installation and setup of Rally - name: Installation and setup of Rally
hosts: utility_all hosts: utility_all
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
user: root user: root
pre_tasks: pre_tasks:
- include: common-tasks/unbound-clients.yml - include: common-tasks/unbound-clients.yml

View File

@ -13,7 +13,7 @@
- name: Install sahara server - name: Install sahara server
hosts: sahara_all hosts: sahara_all
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
user: root user: root
pre_tasks: pre_tasks:
- include: common-tasks/os-lxc-container-setup.yml - include: common-tasks/os-lxc-container-setup.yml

View File

@ -15,7 +15,7 @@
- name: Installation and setup of Swift - name: Installation and setup of Swift
hosts: swift_all:swift_remote_all hosts: swift_all:swift_remote_all
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
max_fail_percentage: 20 max_fail_percentage: 20
user: root user: root
pre_tasks: pre_tasks:

View File

@ -17,7 +17,7 @@
# The services need to be installed first though. # The services need to be installed first though.
- name: Synchronisation of swift ring and ssh keys - name: Synchronisation of swift ring and ssh keys
hosts: swift_all:swift_remote_all hosts: swift_all:swift_remote_all
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
max_fail_percentage: 20 max_fail_percentage: 20
user: root user: root
roles: roles:

View File

@ -15,7 +15,7 @@
- name: Install the tacker components - name: Install the tacker components
hosts: tacker_all hosts: tacker_all
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
max_fail_percentage: 20 max_fail_percentage: 20
user: root user: root
pre_tasks: pre_tasks:

View File

@ -15,7 +15,7 @@
- name: Installation and setup of Tempest - name: Installation and setup of Tempest
hosts: utility_all[0] hosts: utility_all[0]
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
max_fail_percentage: 20 max_fail_percentage: 20
user: root user: root
roles: roles:

View File

@ -18,7 +18,7 @@
- name: Install trove server - name: Install trove server
hosts: trove_all hosts: trove_all
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
user: root user: root
pre_tasks: pre_tasks:
- include: common-tasks/os-lxc-container-setup.yml - include: common-tasks/os-lxc-container-setup.yml

View File

@ -16,7 +16,7 @@
- name: Create and configure rabbitmq container - name: Create and configure rabbitmq container
hosts: "{{ rabbitmq_host_group | default('rabbitmq_all') }}" hosts: "{{ rabbitmq_host_group | default('rabbitmq_all') }}"
serial: 1 serial: 1
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
max_fail_percentage: 0 max_fail_percentage: 0
user: root user: root
pre_tasks: pre_tasks:

View File

@ -44,7 +44,7 @@
- name: Build new repo packages for a given release - name: Build new repo packages for a given release
hosts: repo_masters hosts: repo_masters
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
any_errors_fatal: true any_errors_fatal: true
user: root user: root
serial: 1 serial: 1

View File

@ -15,7 +15,7 @@
- name: Setup repo servers - name: Setup repo servers
hosts: repo_all hosts: repo_all
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
max_fail_percentage: 20 max_fail_percentage: 20
user: root user: root
pre_tasks: pre_tasks:

View File

@ -15,7 +15,7 @@
- name: Install rsyslog - name: Install rsyslog
hosts: rsyslog hosts: rsyslog
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
max_fail_percentage: 20 max_fail_percentage: 20
user: root user: root
pre_tasks: pre_tasks:

View File

@ -19,7 +19,7 @@
- name: Apply security hardening configurations - name: Apply security hardening configurations
hosts: "{{ security_host_group|default('hosts') }}" hosts: "{{ security_host_group|default('hosts') }}"
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
user: root user: root
roles: roles:
- role: "ansible-hardening" - role: "ansible-hardening"

View File

@ -16,7 +16,7 @@
- name: Install unbound DNS resolvers - name: Install unbound DNS resolvers
hosts: hosts:
- unbound - unbound
gather_facts: "{{ gather_facts | default(True) }}" gather_facts: "{{ osa_gather_facts | default(True) }}"
user: root user: root
pre_tasks: pre_tasks:
- include: common-tasks/os-log-dir-setup.yml - include: common-tasks/os-log-dir-setup.yml

View File

@ -174,7 +174,7 @@ pushd "${OSA_CLONE_DIR}/playbooks"
# Prepare the hosts # Prepare the hosts
export ANSIBLE_LOG_PATH="${ANSIBLE_LOG_DIR}/setup-hosts.log" 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 some data about the instance and the rest of the system
log_instance_info log_instance_info
@ -186,14 +186,14 @@ pushd "${OSA_CLONE_DIR}/playbooks"
# Prepare the infrastructure # Prepare the infrastructure
export ANSIBLE_LOG_PATH="${ANSIBLE_LOG_DIR}/setup-infrastructure.log" 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 some data about the instance and the rest of the system
log_instance_info log_instance_info
# Setup OpenStack # Setup OpenStack
export ANSIBLE_LOG_PATH="${ANSIBLE_LOG_DIR}/setup-openstack.log" 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 some data about the instance and the rest of the system
log_instance_info log_instance_info