openstack/openstack-ansible
Code Issues Proposed changes

Gnocchi identities created before Swift playbook

Browse Source 
When Swift is used for Gnocchi storage we need to add the project
to which the Gnocchi service user is assigned to an exclude list for
Swift's telemetry middleware. That requires the Gnocchi identities
to be created before Swift playbook execution but Gnocchi service
install depends on an existing Swift service when it uses Swift
for storage. This change ensures that those identities exist before
Swift playbook execution.

Depends-On: If66fa8c3aa44d44019e3cedb5033ab83a65bd6ab
Depends-On: If4fa5c1c4401911057f99488694d74f5d83330a8
Change-Id: I0b6b53d5a4ad7423058c382160cc5009e0b3d866
This commit is contained in:
Steve Lewis 2016-09-07 12:26:34 -07:00
parent 60d23ba7bf
commit eff7914cfe
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/inventory/group_vars/swift_all.yml
View File

@ -20,4 +20,4 @@ swift_service_in_ldap: "{{ service_ldap_backend_enabled }}"
swift_package_state: "{{ package_state }}" swift_package_state: "{{ package_state }}"
# Used to optionally filter Gnocchi-originated traffic in Ceilometermiddleware # Used to optionally filter Gnocchi-originated traffic in Ceilometermiddleware
swift_gnocchi_enabled: "{{ groups['gnocchi_all'] is defined and groups['gnocchi_all'] | length > 0 }}" swift_gnocchi_enabled: "{{ (groups['gnocchi_all'] is defined and groups['gnocchi_all'] | length > 0) }}"

7
playbooks/setup-openstack.yml
View File

@ -22,6 +22,13 @@
- include: os-horizon-install.yml - include: os-horizon-install.yml
- include: os-ceilometer-install.yml - include: os-ceilometer-install.yml
- include: os-aodh-install.yml - include: os-aodh-install.yml
#NOTE(stevelle) Ensure Gnocchi identities exist before Swift
- include: os-gnocchi-install.yml
when:
- gnocchi_storage_driver is defined
- gnocchi_storage_driver == 'swift'
vars:
gnocchi_identity_only: True
- include: os-swift-install.yml - include: os-swift-install.yml
- include: os-gnocchi-install.yml - include: os-gnocchi-install.yml
- include: os-ironic-install.yml - include: os-ironic-install.yml