diff options
Diffstat (limited to 'puppet/controller-puppet.yaml')
| -rw-r--r-- | puppet/controller-puppet.yaml | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml index 5f9bd8b5..3e2957f9 100644 --- a/puppet/controller-puppet.yaml +++ b/puppet/controller-puppet.yaml @@ -506,6 +506,18 @@ resources: - - 'mysql://neutron:unset@' - {get_param: VirtualIP} - '/ovs_neutron?charset=utf8' + neutron_url: + list_join: + - '' + - - 'http://' + - {get_param: VirtualIP} + - ':9696' + neutron_admin_auth_url: + list_join: + - '' + - - 'http://' + - {get_param: VirtualIP} + - ':35357/v2.0' ceilometer_metering_secret: {get_param: CeilometerMeteringSecret} ceilometer_password: {get_param: CeilometerPassword} ceilometer_dsn: @@ -701,6 +713,10 @@ resources: nova::api::admin_password: {get_input: nova_password} nova::database_connection: {get_input: nova_dsn} nova::api::neutron_metadata_proxy_shared_secret: {get_input: neutron_metadata_proxy_shared_secret} + nova::network::neutron::neutron_admin_password: {get_input: neutron_password} + nova::network::neutron::neutron_url: {get_input: neutron_url} + nova::network::neutron::neutron_admin_auth_url: {get_input: neutron_admin_auth_url} + # Rabbit rabbit_username: {get_input: rabbit_username} rabbit_password: {get_input: rabbit_password} |