diff options
-rw-r--r-- | network/config/bond-with-vlans/ceph-storage.yaml | 2 | ||||
-rw-r--r-- | network/config/bond-with-vlans/cinder-storage.yaml | 2 | ||||
-rw-r--r-- | network/config/bond-with-vlans/compute.yaml | 2 | ||||
-rw-r--r-- | network/config/bond-with-vlans/controller.yaml | 2 | ||||
-rw-r--r-- | network/config/bond-with-vlans/swift-storage.yaml | 2 | ||||
-rw-r--r-- | overcloud-without-mergepy.yaml | 2 | ||||
-rw-r--r-- | puppet/compute-puppet.yaml | 2 | ||||
-rw-r--r-- | puppet/controller-puppet.yaml | 3 |
8 files changed, 9 insertions, 8 deletions
diff --git a/network/config/bond-with-vlans/ceph-storage.yaml b/network/config/bond-with-vlans/ceph-storage.yaml index 3216018c..ed9fff7a 100644 --- a/network/config/bond-with-vlans/ceph-storage.yaml +++ b/network/config/bond-with-vlans/ceph-storage.yaml @@ -2,7 +2,7 @@ heat_template_version: 2015-04-30 description: > Software Config to drive os-net-config with 2 bonded nics on a bridge - with a VLANs attached for the ceph storage role. + with VLANs attached for the ceph storage role. parameters: ExternalIpSubnet: diff --git a/network/config/bond-with-vlans/cinder-storage.yaml b/network/config/bond-with-vlans/cinder-storage.yaml index ef871549..95733fca 100644 --- a/network/config/bond-with-vlans/cinder-storage.yaml +++ b/network/config/bond-with-vlans/cinder-storage.yaml @@ -2,7 +2,7 @@ heat_template_version: 2015-04-30 description: > Software Config to drive os-net-config with 2 bonded nics on a bridge - with a VLANs attached for the cinder storage role. + with VLANs attached for the cinder storage role. parameters: ExternalIpSubnet: diff --git a/network/config/bond-with-vlans/compute.yaml b/network/config/bond-with-vlans/compute.yaml index 25bb91cb..709b3b5b 100644 --- a/network/config/bond-with-vlans/compute.yaml +++ b/network/config/bond-with-vlans/compute.yaml @@ -2,7 +2,7 @@ heat_template_version: 2015-04-30 description: > Software Config to drive os-net-config with 2 bonded nics on a bridge - with a VLANs attached for the compute role. + with VLANs attached for the compute role. parameters: ExternalIpSubnet: diff --git a/network/config/bond-with-vlans/controller.yaml b/network/config/bond-with-vlans/controller.yaml index a28201d1..16a0dec2 100644 --- a/network/config/bond-with-vlans/controller.yaml +++ b/network/config/bond-with-vlans/controller.yaml @@ -2,7 +2,7 @@ heat_template_version: 2015-04-30 description: > Software Config to drive os-net-config with 2 bonded nics on a bridge - with a VLANs attached for the controller role. + with VLANs attached for the controller role. parameters: ExternalIpSubnet: diff --git a/network/config/bond-with-vlans/swift-storage.yaml b/network/config/bond-with-vlans/swift-storage.yaml index b6cacc7e..6549ce7a 100644 --- a/network/config/bond-with-vlans/swift-storage.yaml +++ b/network/config/bond-with-vlans/swift-storage.yaml @@ -2,7 +2,7 @@ heat_template_version: 2015-04-30 description: > Software Config to drive os-net-config with 2 bonded nics on a bridge - with a VLANs attached for the swift storage role. + with VLANs attached for the swift storage role. parameters: ExternalIpSubnet: diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index 285fd204..ce79a52b 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -485,7 +485,7 @@ parameters: - custom_constraint: nova.flavor ServiceNetMap: default: - NeutronLocalIp: tenant + NeutronTenantNetwork: tenant CeilometerApiNetwork: internal_api MongoDbNetwork: internal_api CinderApiNetwork: internal_api diff --git a/puppet/compute-puppet.yaml b/puppet/compute-puppet.yaml index ed897a43..b34e7a6f 100644 --- a/puppet/compute-puppet.yaml +++ b/puppet/compute-puppet.yaml @@ -430,7 +430,7 @@ resources: - {get_param: GlancePort} neutron_flat_networks: {get_param: NeutronFlatNetworks} neutron_host: {get_param: NeutronHost} - neutron_local_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronLocalIp]}]} + neutron_local_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronTenantNetwork]}]} neutron_tenant_network_type: {get_param: NeutronNetworkType} neutron_tunnel_types: {get_param: NeutronTunnelTypes} neutron_network_vlan_ranges: diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml index 7969e9c7..953e592f 100644 --- a/puppet/controller-puppet.yaml +++ b/puppet/controller-puppet.yaml @@ -753,7 +753,7 @@ resources: keystone_admin_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]}]} mongo_db_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, MongoDbNetwork]}]} neutron_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronApiNetwork]}]} - neutron_local_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronLocalIp]}]} + neutron_local_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronTenantNetwork]}]} ceilometer_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CeilometerApiNetwork]}]} nova_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NovaApiNetwork]}]} nova_metadata_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NovaMetadataNetwork]}]} @@ -976,6 +976,7 @@ resources: 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} + nova::vncproxy::host: {get_input: nova_api_network} # Horizon horizon::django_debug: {get_input: debug} |