diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-21 06:01:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-21 06:01:09 +0000 |
| commit | 42ed08b6c016e85c3b3026571200e3f81866354b (patch) | |
| tree | 0499ed2ef49083b82f1b1796c1de49dad2dd6c35 /puppet | |
| parent | 073e43de7d907ec1b3f52c82aa9621d5af196897 (diff) | |
| parent | d381054c8e92c8341e243179e2de447cf11242b3 (diff) | |
Merge "Replace references to the 192.0.2 network" into stable/ocata
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/extraconfig/pre_deploy/controller/neutron-ml2-cisco-n1kv.yaml | 4 | ||||
| -rw-r--r-- | puppet/services/network/contrail-vrouter.yaml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/puppet/extraconfig/pre_deploy/controller/neutron-ml2-cisco-n1kv.yaml b/puppet/extraconfig/pre_deploy/controller/neutron-ml2-cisco-n1kv.yaml index bca6010a..40b407bc 100644 --- a/puppet/extraconfig/pre_deploy/controller/neutron-ml2-cisco-n1kv.yaml +++ b/puppet/extraconfig/pre_deploy/controller/neutron-ml2-cisco-n1kv.yaml @@ -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 diff --git a/puppet/services/network/contrail-vrouter.yaml b/puppet/services/network/contrail-vrouter.yaml index db9f0836..0cd1f829 100644 --- a/puppet/services/network/contrail-vrouter.yaml +++ b/puppet/services/network/contrail-vrouter.yaml @@ -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: |