openstack
/
openstack-ansible
Code Issues Proposed changes

Force Ansible to use dynamic includes 

Ansible 2.1.1 introduces a regression in the way conditional
includes are handled which results in every task in the
included file being evaluated even if the condition for the
include is not met. This extends the run time significantly
for a deployment.

This patch forces all conditional includes to be dynamic.

Change-Id: I864e5178f6cb8ca245bafbed9a94ae8d4ea29eae
Related-Bug: https://github.com/ansible/ansible/issues/17687
This commit is contained in:
Jesse Pretorius 2016-09-22 11:20:14 +01:00 committed by Jesse Pretorius (odyssey4me)
parent 350c0611cf
commit e2796764d1
16 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/os-aodh-install.yml
View File

@ -24,6 +24,7 @@
sort_group_name: "aodh_all"
- include: common-tasks/os-lxc-container-setup.yml
- include: common-tasks/rabbitmq-vhost-user.yml
static: no
vars:
user: "{{ aodh_rabbitmq_userid }}"
password: "{{ aodh_rabbitmq_password }}"
@ -38,6 +39,7 @@
- src: "/openstack/log/{{ inventory_hostname }}-aodh"
dest: "/var/log/aodh"
- include: common-tasks/mysql-db-user.yml
static: no
vars:
user_name: "{{ aodh_galera_user }}"
password: "{{ aodh_container_db_password }}"

1
playbooks/os-ceilometer-install.yml
View File

@ -24,6 +24,7 @@
sort_group_name: "ceilometer_all"
- include: common-tasks/os-lxc-container-setup.yml
- include: common-tasks/rabbitmq-vhost-user.yml
static: no
vars:
user: "{{ ceilometer_rabbitmq_userid }}"
password: "{{ ceilometer_rabbitmq_password }}"

5
playbooks/os-cinder-install.yml
View File

@ -23,6 +23,7 @@
vars:
sort_group_name: "cinder_all"
- include: common-tasks/os-lxc-container-setup.yml
static: no
vars:
aa_profile: "unconfined"
extra_container_config:
@ -33,9 +34,11 @@
- inventory_hostname in groups['cinder_volume']
- cinder_backend_lvm_inuse | bool
- include: common-tasks/os-lxc-container-setup.yml
static: no
when:
- inventory_hostname not in groups['cinder_volume']
- include: common-tasks/rabbitmq-vhost-user.yml
static: no
vars:
user: "{{ cinder_rabbitmq_userid }}"
password: "{{ cinder_rabbitmq_password }}"
@ -45,6 +48,7 @@
- inventory_hostname == groups['cinder_all'][0]
- groups[cinder_rabbitmq_host_group] | length > 0
- include: common-tasks/rabbitmq-vhost-user.yml
static: no
vars:
user: "{{ cinder_rabbitmq_telemetry_userid }}"
password: "{{ cinder_rabbitmq_telemetry_password }}"
@ -62,6 +66,7 @@
- src: "/openstack/log/{{ inventory_hostname }}-cinder"
dest: "/var/log/cinder"
- include: common-tasks/mysql-db-user.yml
static: no
vars:
user_name: "{{ cinder_galera_user }}"
password: "{{ cinder_container_mysql_password }}"

5
playbooks/os-glance-install.yml
View File

@ -23,14 +23,17 @@
vars:
sort_group_name: "glance_all"
- include: common-tasks/os-lxc-container-setup.yml
static: no
vars:
list_of_bind_mounts:
- bind_dir_path: "/var/lib/glance/images"
mount_path: "/openstack/{{ inventory_hostname }}"
when: (glance_default_store == "file") and (glance_nfs_client is not defined)
- include: common-tasks/os-lxc-container-setup.yml
static: no
when: (glance_default_store != "file") or (glance_nfs_client is defined)
- include: common-tasks/rabbitmq-vhost-user.yml
static: no
vars:
user: "{{ glance_rabbitmq_userid }}"
password: "{{ glance_rabbitmq_password }}"
@ -40,6 +43,7 @@
- inventory_hostname == groups['glance_all'][0]
- groups[glance_rabbitmq_host_group] | length > 0
- include: common-tasks/rabbitmq-vhost-user.yml
static: no
vars:
user: "{{ glance_rabbitmq_telemetry_userid }}"
password: "{{ glance_rabbitmq_telemetry_password }}"
@ -57,6 +61,7 @@
- src: "/openstack/log/{{ inventory_hostname }}-glance"
dest: "/var/log/glance"
- include: common-tasks/mysql-db-user.yml
static: no
vars:
user_name: "{{ glance_galera_user }}"
password: "{{ glance_container_mysql_password }}"

3
playbooks/os-gnocchi-install.yml
View File

@ -19,12 +19,14 @@
user: root
pre_tasks:
- include: common-tasks/os-lxc-container-setup.yml
static: no
vars:
list_of_bind_mounts:
- bind_dir_path: "/var/lib/gnocchi"
mount_path: "/openstack/{{ inventory_hostname }}"
when: (gnocchi_storage_driver == "file") and (gnocchi_storage_driver is not defined)
- include: common-tasks/os-lxc-container-setup.yml
static: no
when: (gnocchi_storage_driver != "file") or (gnocchi_storage_driver is defined)
- include: common-tasks/os-log-dir-setup.yml
vars:
@ -32,6 +34,7 @@
- src: "/openstack/log/{{ inventory_hostname }}-gnocchi"
dest: "/var/log/gnocchi"
- include: common-tasks/mysql-db-user.yml
static: no
vars:
user_name: "{{ gnocchi_galera_user }}"
password: "{{ gnocchi_container_mysql_password }}"

3
playbooks/os-heat-install.yml
View File

@ -24,6 +24,7 @@
sort_group_name: "heat_all"
- include: common-tasks/os-lxc-container-setup.yml
- include: common-tasks/rabbitmq-vhost-user.yml
static: no
vars:
user: "{{ heat_rabbitmq_userid }}"
password: "{{ heat_rabbitmq_password }}"
@ -33,6 +34,7 @@
- inventory_hostname == groups['heat_all'][0]
- groups[heat_rabbitmq_host_group] | length > 0
- include: common-tasks/rabbitmq-vhost-user.yml
static: no
vars:
user: "{{ heat_rabbitmq_telemetry_userid }}"
password: "{{ heat_rabbitmq_telemetry_password }}"
@ -50,6 +52,7 @@
- src: "/openstack/log/{{ inventory_hostname }}-heat"
dest: "/var/log/heat"
- include: common-tasks/mysql-db-user.yml
static: no
vars:
user_name: "{{ heat_galera_user }}"
password: "{{ heat_container_mysql_password }}"

1
playbooks/os-horizon-install.yml
View File

@ -29,6 +29,7 @@
- src: "/openstack/log/{{ inventory_hostname }}-horizon"
dest: "/var/log/horizon"
- include: common-tasks/mysql-db-user.yml
static: no
vars:
user_name: "{{ horizon_galera_user }}"
password: "{{ horizon_container_mysql_password }}"

2
playbooks/os-ironic-install.yml
View File

@ -23,6 +23,7 @@
sort_group_name: "ironic_all"
- include: common-tasks/os-lxc-container-setup.yml
- include: common-tasks/rabbitmq-vhost-user.yml
static: no
vars:
user: "{{ ironic_rabbitmq_userid }}"
password: "{{ ironic_rabbitmq_password }}"
@ -32,6 +33,7 @@
- inventory_hostname == groups['ironic_all'][0]
- groups[ironic_rabbitmq_host_group] | length > 0
- include: common-tasks/mysql-db-user.yml
static: no
vars:
user_name: "{{ ironic_galera_user }}"
password: "{{ ironic_container_mysql_password }}"

3
playbooks/os-keystone-install.yml
View File

@ -24,6 +24,7 @@
sort_group_name: "keystone_all"
- include: common-tasks/os-lxc-container-setup.yml
- include: common-tasks/rabbitmq-vhost-user.yml
static: no
vars:
user: "{{ keystone_rabbitmq_userid }}"
password: "{{ keystone_rabbitmq_password }}"
@ -33,6 +34,7 @@
- inventory_hostname == groups['keystone_all'][0]
- groups[keystone_rabbitmq_host_group] | length > 0
- include: common-tasks/rabbitmq-vhost-user.yml
static: no
vars:
user: "{{ keystone_rabbitmq_telemetry_userid }}"
password: "{{ keystone_rabbitmq_telemetry_password }}"
@ -50,6 +52,7 @@
- src: "/openstack/log/{{ inventory_hostname }}-keystone"
dest: "/var/log/keystone"
- include: common-tasks/mysql-db-user.yml
static: no
vars:
user_name: "{{ keystone_galera_user }}"
password: "{{ keystone_container_mysql_password }}"

4
playbooks/os-magnum-install.yml
View File

@ -31,6 +31,7 @@
vars:
sort_group_name: "magnum_all"
- include: common-tasks/rabbitmq-vhost-user.yml
static: no
vars:
user: "{{ magnum_rabbitmq_userid }}"
password: "{{ magnum_rabbitmq_password }}"
@ -40,6 +41,7 @@
- inventory_hostname == groups['magnum_all'][0]
- groups[magnum_rabbitmq_host_group] | length > 0
- include: common-tasks/mysql-db-user.yml
static: no
vars:
user_name: "{{ magnum_galera_user }}"
password: "{{ magnum_galera_password }}"
@ -62,4 +64,4 @@
vars:
is_metal: "{{ properties.is_metal|default(false) }}"
tags:
- "magnum"
- "magnum"

5
playbooks/os-neutron-install.yml
View File

@ -23,6 +23,7 @@
vars:
sort_group_name: "neutron_all"
- include: common-tasks/os-lxc-container-setup.yml
static: no
vars:
aa_profile: "unconfined"
list_of_bind_mounts:
@ -32,8 +33,10 @@
- "lxc.cgroup.devices.allow=a *:* rmw"
when: inventory_hostname in groups['neutron_agent']
- include: common-tasks/os-lxc-container-setup.yml
static: no
when: inventory_hostname not in groups['neutron_agent']
- include: common-tasks/rabbitmq-vhost-user.yml
static: no
vars:
user: "{{ neutron_rabbitmq_userid }}"
password: "{{ neutron_rabbitmq_password }}"
@ -43,6 +46,7 @@
- inventory_hostname == groups['neutron_all'][0]
- groups[neutron_rabbitmq_host_group] | length > 0
- include: common-tasks/rabbitmq-vhost-user.yml
static: no
vars:
user: "{{ neutron_rabbitmq_telemetry_userid }}"
password: "{{ neutron_rabbitmq_telemetry_password }}"
@ -60,6 +64,7 @@
- src: "/openstack/log/{{ inventory_hostname }}-neutron"
dest: "/var/log/neutron"
- include: common-tasks/mysql-db-user.yml
static: no
vars:
user_name: "{{ neutron_galera_user }}"
password: "{{ neutron_container_mysql_password }}"

4
playbooks/os-nova-install.yml
View File

@ -24,6 +24,7 @@
sort_group_name: "nova_all"
- include: common-tasks/os-lxc-container-setup.yml
- include: common-tasks/rabbitmq-vhost-user.yml
static: no
vars:
user: "{{ nova_rabbitmq_userid }}"
password: "{{ nova_rabbitmq_password }}"
@ -33,6 +34,7 @@
- inventory_hostname == groups['nova_all'][0]
- groups[nova_rabbitmq_host_group] | length > 0
- include: common-tasks/rabbitmq-vhost-user.yml
static: no
vars:
user: "{{ nova_rabbitmq_telemetry_userid }}"
password: "{{ nova_rabbitmq_telemetry_password }}"
@ -50,6 +52,7 @@
- src: "/openstack/log/{{ inventory_hostname }}-nova"
dest: "/var/log/nova"
- include: common-tasks/mysql-db-user.yml
static: no
vars:
user_name: "{{ nova_galera_user }}"
password: "{{ nova_container_mysql_password }}"
@ -57,6 +60,7 @@
db_name: "{{ nova_galera_database }}"
when: inventory_hostname == groups['nova_all'][0]
- include: common-tasks/mysql-db-user.yml
static: no
vars:
user_name: "{{ nova_api_galera_user }}"
password: "{{ nova_api_container_mysql_password }}"

1
playbooks/os-rally-install.yml
View File

@ -19,6 +19,7 @@
user: root
pre_tasks:
- include: common-tasks/mysql-db-user.yml
static: no
vars:
user_name: "{{ rally_galera_user }}"
password: "{{ rally_galera_password }}"

3
playbooks/os-sahara-install.yml
View File

@ -21,6 +21,7 @@
sort_group_name: "sahara_all"
- include: common-tasks/os-lxc-container-setup.yml
- include: common-tasks/rabbitmq-vhost-user.yml
static: no
vars:
user: "{{ sahara_rabbitmq_userid }}"
password: "{{ sahara_rabbitmq_password }}"
@ -30,6 +31,7 @@
- inventory_hostname == groups['sahara_all'][0]
- groups[sahara_rabbitmq_host_group] | length > 0
- include: common-tasks/rabbitmq-vhost-user.yml
static: no
vars:
user: "{{ sahara_rabbitmq_telemetry_userid }}"
password: "{{ sahara_rabbitmq_telemetry_password }}"
@ -47,6 +49,7 @@
- src: "/openstack/log/{{ inventory_hostname }}-sahara"
dest: "/var/log/sahara"
- include: common-tasks/mysql-db-user.yml
static: no
vars:
user_name: "{{ sahara_galera_user }}"
password: "{{ sahara_container_mysql_password }}"

1
playbooks/os-swift-install.yml
View File

@ -119,6 +119,7 @@
- not is_metal | bool
# If we're using ceilometer then swift needs a rabbitmq/vhost & usera
- include: common-tasks/rabbitmq-vhost-user.yml
static: no
vars:
user: "{{ swift_rabbitmq_telemetry_userid }}"
password: "{{ swift_rabbitmq_telemetry_password }}"

2
playbooks/repo-server.yml
View File

@ -28,6 +28,7 @@
when: repo_build_git_cache is defined
- include: common-tasks/os-lxc-container-setup.yml
static: no
vars:
list_of_bind_mounts:
- mount_path: "/openstack/{{ inventory_hostname }}"
@ -35,6 +36,7 @@
when: repo_build_git_cache is not defined or not _local_git_cache.stat.exists
- include: common-tasks/os-lxc-container-setup.yml
static: no
vars:
repo_build_git_cache_bind_mount:
- mount_path: "{{ repo_build_git_cache }}"