Merge "Replace references to the 192.0.2 network"

This commit is contained in:
Jenkins 2017-04-11 07:09:54 +00:00 committed by Gerrit Code Review
commit ccb0655db4
13 changed files with 39 additions and 16 deletions

View File

@ -67,11 +67,11 @@ example:
parameter_defaults:
ControlPlaneDefaultRoute: 192.168.122.130
ControlPlaneSubnetCidr: "24"
EC2MetadataIp: "192.0.2.1"
EC2MetadataIp: "192.168.24.1"
In this example, 192.168.122.130 is the external management IP of an
undercloud, thus it is the default route for the configured local_ip value of
192.0.2.1.
192.168.24.1.
os-collect-config

View File

@ -8,7 +8,7 @@ resource_registry:
parameter_defaults:
ControlPlaneSubnetCidr: '24'
ControlPlaneDefaultRoute: 192.0.2.254
ControlPlaneDefaultRoute: 192.168.24.254
InternalApiNetCidr: 10.0.0.0/24
InternalApiAllocationPools: [{'start': '10.0.0.10', 'end': '10.0.0.200'}]
InternalApiDefaultRoute: 10.0.0.1
@ -17,7 +17,7 @@ parameter_defaults:
ManagementInterfaceDefaultRoute: 10.1.0.1
ExternalNetCidr: 10.2.0.0/24
ExternalAllocationPools: [{'start': '10.2.0.10', 'end': '10.2.0.200'}]
EC2MetadataIp: 192.0.2.1 # Generally the IP of the Undercloud
EC2MetadataIp: 192.168.24.1 # Generally the IP of the Undercloud
DnsServers: ["8.8.8.8","8.8.4.4"]
VrouterPhysicalInterface: eth1
VrouterGateway: 10.0.0.1

View File

@ -13,7 +13,7 @@ parameter_defaults:
# to control your VIPs (currently one per network)
# NOTE: we will eventually move to one VIP per service
#
ControlFixedIPs: [{'ip_address':'192.0.2.251'}]
ControlFixedIPs: [{'ip_address':'192.168.24.251'}]
PublicVirtualFixedIPs: [{'ip_address':'2001:db8:fd00:1000:0000:0000:0000:0005'}]
InternalApiVirtualFixedIPs: [{'ip_address':'fd00:fd00:fd00:2000:0000:0000:0000:0005'}]
StorageVirtualFixedIPs: [{'ip_address':'fd00:fd00:fd00:3000:0000:0000:0000:0005'}]

View File

@ -12,7 +12,7 @@ parameter_defaults:
# to control your VIPs (currently one per network)
# NOTE: we will eventually move to one VIP per service
#
ControlFixedIPs: [{'ip_address':'192.0.2.251'}]
ControlFixedIPs: [{'ip_address':'192.168.24.251'}]
PublicVirtualFixedIPs: [{'ip_address':'10.0.0.251'}]
InternalApiVirtualFixedIPs: [{'ip_address':'172.16.2.251'}]
StorageVirtualFixedIPs: [{'ip_address':'172.16.1.251'}]

View File

@ -18,7 +18,7 @@ resource_registry:
## (note the use of port 24284 for ssl connections)
#
# LoggingServers:
# - host: 192.0.2.11
# - host: 192.168.24.11
# port: 24284
# LoggingUsesSSL: true
# LoggingSharedKey: secret

View File

@ -18,8 +18,8 @@ parameter_defaults:
# CIDR subnet mask length for provisioning network
ControlPlaneSubnetCidr: '24'
# Gateway router for the provisioning network (or Undercloud IP)
ControlPlaneDefaultRoute: 192.0.2.254
EC2MetadataIp: 192.0.2.1 # Generally the IP of the Undercloud
ControlPlaneDefaultRoute: 192.168.24.254
EC2MetadataIp: 192.168.24.1 # Generally the IP of the Undercloud
# Customize the IP subnets to match the local environment
InternalApiNetCidr: 172.17.0.0/24
StorageNetCidr: 172.18.0.0/24

View File

@ -5,7 +5,7 @@ resource_registry:
OS::TripleO::ComputeExtraConfigPre: ../puppet/extraconfig/pre_deploy/controller/neutron-ml2-cisco-n1kv.yaml
parameter_defaults:
N1000vVSMIP: '192.0.2.50'
N1000vMgmtGatewayIP: '192.0.2.1'
N1000vVSMIP: '192.168.24.50'
N1000vMgmtGatewayIP: '192.168.24.1'
N1000vVSMDomainID: '100'
N1000vVSMHostMgmtIntf: 'br-ex'

View File

@ -5,7 +5,7 @@ parameter_defaults:
KeystoneLDAPDomainEnable: true
KeystoneLDAPBackendConfigs:
tripleoldap:
url: ldap://192.0.2.250
url: ldap://192.168.24.251
user: cn=openstack,ou=Users,dc=tripleo,dc=example,dc=com
password: Secrete
suffix: dc=tripleo,dc=example,dc=com

View File

@ -0,0 +1,3 @@
parameter_defaults:
ControlPlaneDefaultRoute: 192.0.2.1
EC2MetadataIp: 192.0.2.1

View File

@ -33,7 +33,7 @@ parameters:
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
type: string
default: 192.0.2.1
default: 192.168.24.1
EC2MetadataIp: # Override this via parameter_defaults
description: The IP address of the EC2 metadata server.
type: string

View File

@ -10,7 +10,7 @@ parameters:
# Config specific parameters, to be provided via parameter_defaults
N1000vVSMIP:
type: string
default: '192.0.2.50'
default: '192.168.24.50'
N1000vVSMDomainID:
type: number
default: 100
@ -62,7 +62,7 @@ parameters:
default: '255.255.255.0'
N1000vMgmtGatewayIP:
type: string
default: '192.0.2.1'
default: '192.168.24.1'
N1000vPacemakerControl:
type: boolean
default: true

View File

@ -27,7 +27,7 @@ parameters:
description: vRouter physical interface
type: string
ContrailVrouterGateway:
default: '192.0.2.1'
default: '192.168.24.1'
description: vRouter default gateway
type: string
ContrailVrouterNetmask:

View File

@ -0,0 +1,20 @@
---
upgrade:
- |
The default network for the ctlplane changed from 192.0.2.0/24 to
192.168.24.0/24. All references to the ctlplane network in the templates
have been updated to reflect this change. When upgrading from a previous
release, if the default network was used for the ctlplane (192.0.2.0/24),
then it is necessary to provide as input, via environment file, the correct
setting for all the parameters that previously defaulted to 192.0.2.x and
now default to 192.168.24.x; there is an environment file which could be
used on upgrade `environments/updates/update-from-192_0_2-subnet.yaml` to
cover a simple scenario but it won't be enough for scenarios using an
external load balancer, Contrail or Cisto N1KV. Follows a list of params to
be provided on upgrade.
From contrail-net.yaml: EC2MetadataIp, ControlPlaneDefaultRoute
From external-loadbalancer-vip-v6.yaml: ControlFixedIPs
From external-loadbalancer-vip.yaml: ControlFixedIPs
From network-environment.yaml: EC2MetadataIp, ControlPlaneDefaultRoute
From neutron-ml2-cisco-n1kv.yaml: N1000vVSMIP, N1000vMgmtGatewayIP
From contrail-vrouter.yaml: ContrailVrouterGateway