diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-02-24 10:04:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-02-24 10:04:18 +0000 |
| commit | 9badd7485b7bcf817c0eeb4a207dd5b6cc2d7dd2 (patch) | |
| tree | 58583cc2706215f599fb019a11f1460d9eca8a6e /puppet/compute.yaml | |
| parent | 949b6d1cc247a66869c627a504436f1642481667 (diff) | |
| parent | 8c6943e898453b3e6fb05c1d238301bdb7d0fef5 (diff) | |
Merge "Update nova::network::neutron variables to drop deprecated parameters"
Diffstat (limited to 'puppet/compute.yaml')
| -rw-r--r-- | puppet/compute.yaml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/puppet/compute.yaml b/puppet/compute.yaml index 31d76263..4144c412 100644 --- a/puppet/compute.yaml +++ b/puppet/compute.yaml @@ -513,9 +513,9 @@ resources: neutron::agents::ml2::ovs::l2_population: {get_input: neutron_enable_l2pop} neutron_physical_bridge: {get_input: neutron_physical_bridge} neutron_public_interface: {get_input: neutron_public_interface} - nova::network::neutron::neutron_admin_password: {get_input: neutron_password} + nova::network::neutron::neutron_password: {get_input: neutron_password} nova::network::neutron::neutron_url: {get_input: neutron_internal_url} - nova::network::neutron::neutron_admin_auth_url: {get_input: neutron_admin_auth_url} + nova::network::neutron::neutron_auth_url: {get_input: neutron_auth_url} neutron_router_distributed: {get_input: neutron_router_distributed} neutron_agent_mode: {get_input: neutron_agent_mode} neutron_metadata_proxy_shared_secret: {get_input: neutron_metadata_proxy_shared_secret} @@ -631,7 +631,7 @@ resources: AGENT_EXTENSIONS: {get_param: NeutronAgentExtensions} 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]} + neutron_auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri]} keystone_vip: {get_param: KeystonePublicApiVirtualIP} admin_password: {get_param: AdminPassword} rabbit_username: {get_param: RabbitUserName} |