diff options
| author |   David Moreau Simard <dms@redhat.com> | 2016-02-09 17:37:39 -0500 |
|---|---|---|
| committer | David Moreau Simard <dms@redhat.com> | 2016-02-22 14:59:34 +0000 |
| commit | 8c6943e898453b3e6fb05c1d238301bdb7d0fef5 (patch) | |
| tree | eadbd5ef9365058c05bed818ee62e547aaec5555 /puppet/compute.yaml | |
| parent | 838c998d3d6b3f3703f1ba3fea7a47c862e09212 (diff) | |
Update nova::network::neutron variables to drop deprecated parameters
This commit ensures we are not using any deprecated parameters for
nova::network::neutron and are using the right variable names.
Change-Id: Ic1b41e2cdbb6b180496822cc363c433e9388aa02
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 e56c3766..360eb58d 100644 --- a/puppet/compute.yaml +++ b/puppet/compute.yaml @@ -509,9 +509,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} @@ -624,7 +624,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} |