diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-12-07 20:39:12 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-12-07 20:39:12 +0000 |
commit | 10b6bb97133eb36ef0185fd903b3f112cd70a5db (patch) | |
tree | 28b9cb1954b04e0976ddcae56ffda08a76a5b021 /puppet/compute.yaml | |
parent | 4e293c2ada6696f17fa78b6c0aebb815fee5a32d (diff) | |
parent | 444d3ba9028e8e4620db4cb90aa4805cbe7b4686 (diff) |
Merge "Making nova parameters configurable for nuage-metadata-agent"
Diffstat (limited to 'puppet/compute.yaml')
-rw-r--r-- | puppet/compute.yaml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/puppet/compute.yaml b/puppet/compute.yaml index deedf00f..42c6e276 100644 --- a/puppet/compute.yaml +++ b/puppet/compute.yaml @@ -473,6 +473,7 @@ resources: neutron::plugins::ml2::type_drivers: {get_input: neutron_type_drivers} neutron_mechanism_drivers: {get_input: neutron_mechanism_drivers} neutron_public_interface_raw_device: {get_input: neutron_public_interface_raw_device} + keystone_public_api_virtual_ip: {get_input: keystone_vip} admin_password: {get_input: admin_password} ntp::servers: {get_input: ntp_servers} tripleo::packages::enable_install: {get_input: enable_package_install} @@ -564,6 +565,7 @@ resources: neutron_public_interface_raw_device: {get_param: NeutronPublicInterfaceRawDevice} neutron_internal_url: {get_param: [EndpointMap, NeutronInternal, uri]} neutron_admin_auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri]} + keystone_vip: {get_param: KeystonePublicApiVirtualIP} admin_password: {get_param: AdminPassword} rabbit_username: {get_param: RabbitUserName} rabbit_password: {get_param: RabbitPassword} |