1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
|
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Tue, 8 Aug 2017 03:49:53 +0200
Subject: [PATCH] network: public, mgmt: Use arm-pod3 POD config
Move MaaS IPs to x.y.z.2 (upstream Fuel uses x.y.z.3).
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
fi
---
ci/deploy.sh | 2 +-
mcp/config/states/maas | 2 +-
.../baremetal-mcp-ocata-ovs-ha/infra/init.yml | 22 ++++-----
.../baremetal-mcp-ocata-ovs-ha/openstack/init.yml | 56 +++++++++++-----------
4 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/ci/deploy.sh b/ci/deploy.sh
index cf7b3b3..2b4e724 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -139,7 +139,7 @@ URI_REGEXP='(file|https?|ftp)://.*'
export SSH_KEY=${SSH_KEY:-mcp.rsa}
export SALT_MASTER=${SALT_MASTER_IP:-192.168.10.100}
-export MAAS_IP=${MAAS_IP:-192.168.10.3}
+export MAAS_IP=${MAAS_IP:-192.168.10.2}
export SSH_OPTS="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i ${SSH_KEY}"
# Variables below are disabled for now, to be re-introduced or removed later
diff --git a/mcp/config/states/maas b/mcp/config/states/maas
index f0de58d..4b306af 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
@@ -20,7 +20,7 @@ salt -C 'mas01*' state.apply linux.network.interface
salt -C 'mas01*' state.apply maas.pxe_nat
salt -C 'mas01*' state.apply maas.cluster
salt -C 'cfg01*' cmd.run \
- "route add -net 192.168.11.0/24 gw ${MAAS_IP:-192.168.10.3}"
+ "route add -net 192.168.11.0/24 gw ${MAAS_IP:-192.168.10.2}"
wait_for "salt -C 'mas01*' state.apply maas.region"
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
index 93e2de0..1d75356 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
@@ -16,19 +16,19 @@ parameters:
infra_maas_database_password: opnfv_secret
# infra service addresses
- infra_config_address: 10.167.4.100
+ infra_config_address: 172.16.10.100
infra_config_deploy_address: 192.168.10.100
- infra_maas_node01_address: 10.167.4.3
- infra_maas_node01_deploy_address: 192.168.11.3
- infra_maas_node01_external_address: 10.16.0.3
- infra_compute_node01_address: 10.167.4.141
- infra_compute_node02_address: 10.167.4.142
- infra_compute_node03_address: 10.167.4.143
+ infra_maas_node01_address: 172.16.10.2
+ infra_maas_node01_deploy_address: 192.168.11.2
+ infra_maas_node01_external_address: 10.0.8.2
+ infra_compute_node01_address: 172.16.10.141
+ infra_compute_node02_address: 172.16.10.142
+ infra_compute_node03_address: 172.16.10.143
- infra_kvm_address: 10.167.4.140
- infra_kvm_node01_address: 10.167.4.141
- infra_kvm_node02_address: 10.167.4.142
- infra_kvm_node03_address: 10.167.4.143
+ infra_kvm_address: 172.16.10.140
+ infra_kvm_node01_address: 172.16.10.141
+ infra_kvm_node02_address: 172.16.10.142
+ infra_kvm_node03_address: 172.16.10.143
infra_maas_node01_hostname: mas01
infra_kvm_node01_hostname: kvm01
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml
index 4036be1..dce7fb7 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml
@@ -3,9 +3,9 @@ parameters:
openstack_version: ocata
- openstack_gateway_node01_address: 10.167.4.124
- openstack_gateway_node02_address: 10.167.4.125
- openstack_gateway_node03_address: 10.167.4.126
+ openstack_gateway_node01_address: 172.16.10.124
+ openstack_gateway_node02_address: 172.16.10.125
+ openstack_gateway_node03_address: 172.16.10.126
openstack_gateway_node01_tenant_address: 10.1.0.6
openstack_gateway_node02_tenant_address: 10.1.0.7
openstack_gateway_node03_tenant_address: 10.1.0.9
@@ -14,21 +14,21 @@ parameters:
openstack_gateway_node03_hostname: gtw03
# openstack service addresses
- openstack_proxy_address: 10.167.4.80
- openstack_proxy_node01_address: 10.167.4.81
- openstack_proxy_node02_address: 10.167.4.82
- openstack_control_address: 10.167.4.10
- openstack_control_node01_address: 10.167.4.11
- openstack_control_node02_address: 10.167.4.12
- openstack_control_node03_address: 10.167.4.13
- openstack_database_address: 10.167.4.50
- openstack_database_node01_address: 10.167.4.51
- openstack_database_node02_address: 10.167.4.52
- openstack_database_node03_address: 10.167.4.53
- openstack_message_queue_address: 10.167.4.40
- openstack_message_queue_node01_address: 10.167.4.41
- openstack_message_queue_node02_address: 10.167.4.42
- openstack_message_queue_node03_address: 10.167.4.43
+ openstack_proxy_address: 172.16.10.80
+ openstack_proxy_node01_address: 172.16.10.81
+ openstack_proxy_node02_address: 172.16.10.82
+ openstack_control_address: 172.16.10.10
+ 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: 172.16.10.50
+ openstack_database_node01_address: 172.16.10.51
+ openstack_database_node02_address: 172.16.10.52
+ openstack_database_node03_address: 172.16.10.53
+ openstack_message_queue_address: 172.16.10.40
+ openstack_message_queue_node01_address: 172.16.10.41
+ openstack_message_queue_node02_address: 172.16.10.42
+ openstack_message_queue_node03_address: 172.16.10.43
openstack_telemetry_hostname: mdb
@@ -36,18 +36,18 @@ parameters:
openstack_telemetry_node02_hostname: mdb02
openstack_telemetry_node03_hostname: mdb03
- openstack_telemetry_address: 10.167.4.75
- openstack_telemetry_node01_address: 10.167.4.76
- openstack_telemetry_node02_address: 10.167.4.77
- openstack_telemetry_node03_address: 10.167.4.78
+ openstack_telemetry_address: 172.16.10.75
+ openstack_telemetry_node01_address: 172.16.10.76
+ openstack_telemetry_node02_address: 172.16.10.77
+ openstack_telemetry_node03_address: 172.16.10.78
# OpenStack Compute
- openstack_compute_node01_single_address: 10.167.4.101
- openstack_compute_node02_single_address: 10.167.4.102
- openstack_compute_node03_single_address: 10.167.4.103
- openstack_compute_node01_control_address: 10.167.4.101
- openstack_compute_node02_control_address: 10.167.4.102
- openstack_compute_node03_control_address: 10.167.4.103
+ openstack_compute_node01_single_address: 172.16.10.101
+ openstack_compute_node02_single_address: 172.16.10.102
+ openstack_compute_node03_single_address: 172.16.10.103
+ openstack_compute_node01_control_address: 172.16.10.101
+ openstack_compute_node02_control_address: 172.16.10.102
+ openstack_compute_node03_control_address: 172.16.10.103
openstack_compute_node01_tenant_address: 10.1.0.101
openstack_compute_node02_tenant_address: 10.1.0.102
openstack_compute_node03_tenant_address: 10.1.0.103
|
