openstack/openstack-ansible
Code Issues Proposed changes

Merge "Gnocchi identities created before Swift playbook"

Browse Source
This commit is contained in:
Jenkins 2016-09-15 06:45:53 +00:00 committed by Gerrit Code Review
commit 4205048c44
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