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
This commit is contained in:
parent
838c998d3d
commit
8c6943e898
|
@ -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}
|
||||
|
|
|
@ -1083,7 +1083,7 @@ resources:
|
|||
neutron_internal_url: { get_param: [ EndpointMap, NeutronInternal, uri ] }
|
||||
neutron_public_url: { get_param: [ EndpointMap, NeutronPublic, uri ] }
|
||||
neutron_admin_url: { get_param: [ EndpointMap, NeutronAdmin, uri ] }
|
||||
neutron_admin_auth_url: { get_param: [ EndpointMap, KeystoneAdmin, uri_no_suffix ] }
|
||||
neutron_auth_url: { get_param: [ EndpointMap, KeystoneAdmin, uri_no_suffix ] }
|
||||
nova_internal_url: { get_param: [ EndpointMap, NovaInternal, uri ] }
|
||||
ceilometer_backend: {get_param: CeilometerBackend}
|
||||
ceilometer_metering_secret: {get_param: CeilometerMeteringSecret}
|
||||
|
@ -1447,7 +1447,7 @@ resources:
|
|||
neutron::keystone::auth::password: {get_input: neutron_password }
|
||||
neutron::keystone::auth::region: {get_input: keystone_region}
|
||||
neutron::server::notifications::nova_url: {get_input: nova_internal_url}
|
||||
neutron::server::notifications::auth_url: {get_input: neutron_admin_auth_url}
|
||||
neutron::server::notifications::auth_url: {get_input: neutron_auth_url}
|
||||
neutron::server::notifications::tenant_name: 'service'
|
||||
neutron::server::notifications::project_name: 'service'
|
||||
neutron::server::notifications::password: {get_input: nova_password}
|
||||
|
@ -1492,9 +1492,9 @@ resources:
|
|||
nova::glance_api_servers: {get_input: glance_api_servers}
|
||||
nova::api::neutron_metadata_proxy_shared_secret: {get_input: neutron_metadata_proxy_shared_secret}
|
||||
nova::api::instance_name_template: {get_input: instance_name_template}
|
||||
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}
|
||||
nova::vncproxy::host: {get_input: nova_api_network}
|
||||
nova::db::mysql::password: {get_input: nova_password}
|
||||
nova::db::mysql_api::password: {get_input: nova_password}
|
||||
|
|
|
@ -8,8 +8,8 @@ ceilometer::agent::auth::auth_region: 'regionOne'
|
|||
ceilometer::agent::auth::auth_tenant_name: 'admin'
|
||||
|
||||
nova::api::admin_tenant_name: 'service'
|
||||
nova::network::neutron::neutron_admin_tenant_name: 'service'
|
||||
nova::network::neutron::neutron_admin_username: 'neutron'
|
||||
nova::network::neutron::neutron_project_name: 'service'
|
||||
nova::network::neutron::neutron_username: 'neutron'
|
||||
nova::network::neutron::dhcp_domain: ''
|
||||
|
||||
neutron::allow_overlapping_ips: true
|
||||
|
|
Loading…
Reference in New Issue