aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/extraconfig/pre_deploy
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-11 07:09:54 +0000
committerGerrit Code Review <review@openstack.org>2017-04-11 07:09:54 +0000
commitccb0655db4cb0df125a52262e67b39609f78703b (patch)
tree14351abd10d5c24f67446ec514c6ac9c94ac7c40 /puppet/extraconfig/pre_deploy
parent84690023cbae970d1fe753e781f0450b34614be5 (diff)
parentb5b6681a74e001448a836e7eea5e75fba859b88c (diff)
Merge "Replace references to the 192.0.2 network"
Diffstat (limited to 'puppet/extraconfig/pre_deploy')
-rw-r--r--puppet/extraconfig/pre_deploy/controller/neutron-ml2-cisco-n1kv.yaml4
1 files changed, 2 insertions, 2 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