openstack/puppet-nova
Code Issues Proposed changes

Fix catalog compilation when not configuring endpoint

Browse Source 
Previously when you set $configure_endpoint to false and did not have a
keystone_endpoint resource with the same name as is defined by
nova::keystone::auth, the catalog would not be compiled. This was
because a relationship was being established where one resource in the
relationship didn't exist.

This changes this so that the relationship involving the Keystone
endpoint is only defined if $configure_endpoint is set to true.

Change-Id: Ief2ea40d0e4f31e18ba4b1230c5879909a1cfe46
Closes-Bug: 1368686
This commit is contained in:
Risto Laurikainen 2015-02-18 14:07:36 +00:00
parent 00e744a9b1
commit 927353ddf5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/keystone/auth.pp
View File

@ -132,7 +132,9 @@ class nova::keystone::auth(
fail('nova::keystone::auth parameters service_name and service_name_v3 must be different.') fail('nova::keystone::auth parameters service_name and service_name_v3 must be different.')
} }
Keystone_endpoint["${region}/${real_service_name}"] ~> Service <| name == 'nova-api' |> if $configure_endpoint {
Keystone_endpoint["${region}/${real_service_name}"] ~> Service <| name == 'nova-api' |>
}
keystone::resource::service_identity { "nova service, user ${auth_name}": keystone::resource::service_identity { "nova service, user ${auth_name}":
configure_user => $configure_user, configure_user => $configure_user,