aboutsummaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-27 06:49:12 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-02-05 06:03:35 +0100
commit7f2ca07e6822f99ef37c3f9ca6cce15ff00ffed8 (patch)
tree32199ae5973f11aa656dc126d1c0c0e08c2055bd /mcp
parent9c3ecbb5238fa815e3f6b46c1933d69d588a5430 (diff)
[virtual] Change IP addrs to align with baremetal
To be able to re-use pod_config.yaml parameters generated based on PDF for both baremetal and virtual scenarios without forking it, we first need to align the IP addresses used in virtual deployments. Currently hard set values will be parameterized in an ulterior change. - 10.1.0.0/24 (internal): * 105 -> 101 (cmp01); 106 -> 102 (cmp02); * 110 -> 124 (gtw01); - 172.16.10.0/24 (mgmt): * 101 -> 11 (ctl01); * 105 -> 101 (cmp01); 106 -> 102 (cmp02); * 110 -> 124 (gtw01); - 10.16.0.0/24 (public): * 101 -> 11 (ctl01); * 105 -> 101 (cmp01); 106 -> 102 (cmp02); * 110 -> 124 (gtw01); JIRA: FUEL-322 Change-Id: I5d5def4e92c3462f1a34f73dde65ef7a262a5d62 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp')
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml12
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/init_options.yml10
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml12
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml4
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/compute.yml2
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml4
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml4
7 files changed, 24 insertions, 24 deletions
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml
index 555af31c7..994f1c65c 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml
@@ -71,11 +71,11 @@ parameters:
single_address: ${_param:openstack_control_node01_address}
openstack_compute_node01:
params:
- single_address: 172.16.10.105
- tenant_address: 10.1.0.105
- external_address: 10.16.0.105
+ single_address: 172.16.10.101
+ tenant_address: 10.1.0.101
+ external_address: 10.16.0.101
openstack_compute_node02:
params:
- single_address: 172.16.10.106
- tenant_address: 10.1.0.106
- external_address: 10.16.0.106
+ single_address: 172.16.10.102
+ tenant_address: 10.1.0.102
+ external_address: 10.16.0.102
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/init_options.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/init_options.yml
index 9540b9436..2affd3db8 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/init_options.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/init_options.yml
@@ -11,16 +11,16 @@ parameters:
# infra service addresses
infra_config_address: 172.16.10.100
# openstack service addresses
- openstack_control_address: 172.16.10.101
- openstack_control_node01_address: 172.16.10.101
- openstack_control_node02_address: 172.16.10.102
- openstack_control_node03_address: 172.16.10.103
+ openstack_control_address: 172.16.10.11
+ openstack_control_node01_address: 172.16.10.11
+ openstack_control_node02_address: 172.16.10.12
+ openstack_control_node03_address: 172.16.10.13
openstack_database_address: ${_param:openstack_control_address}
openstack_message_queue_address: ${_param:openstack_control_address}
openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
- openstack_gateway_address: 172.16.10.110
+ openstack_gateway_address: 172.16.10.124
control_address: ${_param:openstack_control_address}
ntp_strata_host1: 1.se.pool.ntp.org
ntp_strata_host2: 0.se.pool.ntp.org
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml
index d5606b594..5d2efb53f 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml
@@ -14,7 +14,7 @@ parameters:
openstack_region: RegionOne
admin_email: root@localhost
cluster_public_protocol: http
- cluster_public_host: 10.16.0.101
+ cluster_public_host: 10.16.0.11
neutron_public_protocol: http
neutron_control_dvr: 'False'
neutron_l3_ha: 'False'
@@ -31,11 +31,11 @@ parameters:
cluster_vip_address: ${_param:cluster_public_host}
cluster_local_address: ${_param:openstack_control_address}
cluster_node01_hostname: ctl01
- cluster_node01_address: 172.16.10.101
+ cluster_node01_address: 172.16.10.11
cluster_node02_hostname: ctl02
- cluster_node02_address: 172.16.10.102
+ cluster_node02_address: 172.16.10.12
cluster_node03_hostname: ctl03
- cluster_node03_address: 172.16.10.103
+ cluster_node03_address: 172.16.10.13
rabbitmq_secret_key: opnfv_secret
rabbitmq_admin_password: opnfv_secret
rabbitmq_openstack_password: opnfv_secret
@@ -124,12 +124,12 @@ parameters:
- gtw01
- gtw01.${_param:cluster_domain}
cmp01:
- address: 172.16.10.105
+ address: 172.16.10.101
names:
- cmp01
- cmp01.${_param:cluster_domain}
cmp02:
- address: 172.16.10.106
+ address: 172.16.10.102
names:
- cmp02
- cmp02.${_param:cluster_domain}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml
index 8e38ff81d..89acc4a4b 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml
@@ -23,5 +23,5 @@ parameters:
single_address: ${_param:opendaylight_service_host}
openstack_gateway_node01:
params:
- tenant_address: 10.1.0.110
- external_address: 10.16.0.110
+ tenant_address: 10.1.0.124
+ external_address: 10.16.0.124
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/compute.yml
index 4c42b585b..49870805c 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/compute.yml
@@ -33,7 +33,7 @@ parameters:
proto: static
address: ${_param:tenant_address}
netmask: 255.255.255.0
- gateway: 10.1.0.110
+ gateway: 10.1.0.124
use_interfaces:
- ${_param:tenant_interface}
br-floating:
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml
index e80c442ef..25ee71226 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml
@@ -24,5 +24,5 @@ parameters:
dpdk0_pci: '"0000:00:05.0"'
openstack_gateway_node01:
params:
- tenant_address: 10.1.0.110
- external_address: 10.16.0.110
+ tenant_address: 10.1.0.124
+ external_address: 10.16.0.124
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml
index 66c246859..cefa1727e 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml
@@ -16,5 +16,5 @@ parameters:
node:
openstack_gateway_node01:
params:
- tenant_address: 10.1.0.110
- external_address: 10.16.0.110
+ tenant_address: 10.1.0.124
+ external_address: 10.16.0.124