stackforge/kickstack
Code Issues Proposed changes

Correct export Nova/Quantum metadata proxy shared secret

Browse Source
This commit is contained in:
Florian Haas 2013-07-14 09:40:07 +00:00
parent 1205ac5713
commit a0cfc843f8
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/nova/api.pp
View File

@ -27,12 +27,16 @@ class kickstack::nova::api inherits kickstack {
quantum_metadata_proxy_shared_secret => $secret quantum_metadata_proxy_shared_secret => $secret
} }
# Export the metadata API IP address to be picked up # Export the metadata API IP address and shared secret, to be picked up
# by the Quantum metadata proxy agent on the network node # by the Quantum metadata proxy agent on the network node
kickstack::exportfact::export { "nova_metadata_ip": kickstack::exportfact::export { "nova_metadata_ip":
value => getvar("ipaddress_${nic_management}"), value => getvar("ipaddress_${nic_management}"),
tag => "nova", tag => "nova",
require => Class['::nova::api'] require => Class['::nova::api']
} }
kickstack::exportfact::export { "quantum_metadata_shared_secret":
value => $secret,
tag => 'nova',
require => Class['::nova::api']
}
} }

9
manifests/quantum/agent/metadata.pp
View File

@ -16,14 +16,7 @@ class kickstack::quantum::agent::metadata inherits kickstack {
auth_user => 'quantum', auth_user => 'quantum',
auth_url => "http://${keystone_internal_address}:35357/v2.0", auth_url => "http://${keystone_internal_address}:35357/v2.0",
auth_region => "$kickstack::keystone_region", auth_region => "$kickstack::keystone_region",
metadata_ip => $metadata_ip metadata_ip => $metadata_ip,
}
# Export the registry host name string for the service
kickstack::exportfact::export { "quantum_metadata_shared_secret":
value => "${secret}",
tag => "quantum",
require => Class['::quantum::agents::metadata']
} }
} }