openstack/fuel-library
Code Issues Proposed changes

more strong order in Neutron manifests

Browse Source 
between keystone roles and inserting 'service' tenant-ID to the neutron config.

Change-Id: I9d6780fe924756643f34a597a1abd9e6189611ee
Closes-bug: #1328462
This commit is contained in:
Sergey Vasilenko 2014-06-16 18:30:24 +04:00
parent ff050d23d8
commit 4cc3679a4d
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment/puppet/neutron/manifests/server.pp
View File

@ -96,7 +96,11 @@ class neutron::server (
Neutron_config<||> -> Exec['get_service_tenant_ID']
File['/root/openrc'] -> Exec['get_service_tenant_ID']
Keystone_tenant["${nova_admin_tenant_name}"] -> Exec['get_service_tenant_ID']
Keystone_user_role["${neutron_config['keystone']['admin_user']}@${nova_admin_tenant_name}"] -> Exec['get_service_tenant_ID']
Keystone_endpoint<| title == "${neutron_config['keystone']['admin_user']}" |> -> Exec['get_service_tenant_ID']
Openstack::Ha::Haproxy_service<| title == 'keystone-1' |> -> Exec['get_service_tenant_ID']
Openstack::Ha::Haproxy_service<| title == 'keystone-2' |> -> Exec['get_service_tenant_ID']
exec {'get_service_tenant_ID': # Imitate tries & try_sleep for 'onlyif'