patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch

   1 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
   2 Date: Tue, 8 Aug 2017 03:49:53 +0200
   3 Subject: [PATCH] network: public, mgmt: Use arm-pod3 POD config
   4
   5 Move MaaS IPs to x.y.z.2 (upstream Fuel uses x.y.z.3).
   6
   7 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
   8 ---
   9  ci/deploy.sh                                       |  2 +-
  10  mcp/config/states/maas                             |  2 +-
  11  .../baremetal-mcp-ocata-odl-ha/infra/init.yml      | 22 ++++----
  12  .../baremetal-mcp-ocata-odl-ha/openstack/init.yml  | 62 +++++++++++-----------
  13  .../baremetal-mcp-ocata-ovs-ha/infra/init.yml      | 22 ++++----
  14  .../baremetal-mcp-ocata-ovs-ha/openstack/init.yml  | 60 ++++++++++-----------
  15  6 files changed, 85 insertions(+), 85 deletions(-)
  16
  17 diff --git a/ci/deploy.sh b/ci/deploy.sh
  18 index f51ba5f..5582727 100755
  19 --- a/ci/deploy.sh
  20 +++ b/ci/deploy.sh
  21 @@ -139,7 +139,7 @@ URI_REGEXP='(file|https?|ftp)://.*'
  22
  23  export SSH_KEY=${SSH_KEY:-mcp.rsa}
  24  export SALT_MASTER=${SALT_MASTER_IP:-192.168.10.100}
  25 -export MAAS_IP=${MAAS_IP:-192.168.10.3}
  26 +export MAAS_IP=${MAAS_IP:-192.168.10.2}
  27  export SSH_OPTS="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i ${SSH_KEY}"
  28
  29  # Variables below are disabled for now, to be re-introduced or removed later
  30 diff --git a/mcp/config/states/maas b/mcp/config/states/maas
  31 index 1e14e5f..db0241b 100755
  32 --- a/mcp/config/states/maas
  33 +++ b/mcp/config/states/maas
  34 @@ -52,7 +52,7 @@ salt -C 'mas01*' state.apply linux.network.interface
  35  salt -C 'mas01*' state.apply maas.pxe_nat
  36  salt -C 'mas01*' state.apply maas.cluster
  37  salt -C 'cfg01*' cmd.run \
  38 -  "route add -net 192.168.11.0/24 gw ${MAAS_IP:-192.168.10.3}"
  39 +  "route add -net 192.168.11.0/24 gw ${MAAS_IP:-192.168.10.2}"
  40
  41  wait_for 10 "salt -C 'mas01*' state.apply maas.region"
  42
  43 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
  44 index ab14c58..25746b5 100644
  45 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
  46 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
  47 @@ -16,19 +16,19 @@ parameters:
  48      infra_maas_database_password: opnfv_secret
  49
  50      # infra service addresses
  51 -    infra_config_address: 10.167.4.100
  52 +    infra_config_address: 172.16.10.100
  53      infra_config_deploy_address: 192.168.10.100
  54 -    infra_maas_node01_address: 10.167.4.3
  55 -    infra_maas_node01_deploy_address: 192.168.11.3
  56 -    infra_maas_node01_external_address: 10.16.0.3
  57 -    infra_compute_node01_address: 10.167.4.141
  58 -    infra_compute_node02_address: 10.167.4.142
  59 -    infra_compute_node03_address: 10.167.4.143
  60 +    infra_maas_node01_address: 172.16.10.2
  61 +    infra_maas_node01_deploy_address: 192.168.11.2
  62 +    infra_maas_node01_external_address: 10.0.8.2
  63 +    infra_compute_node01_address: 172.16.10.141
  64 +    infra_compute_node02_address: 172.16.10.142
  65 +    infra_compute_node03_address: 172.16.10.143
  66
  67 -    infra_kvm_address: 10.167.4.140
  68 -    infra_kvm_node01_address: 10.167.4.141
  69 -    infra_kvm_node02_address: 10.167.4.142
  70 -    infra_kvm_node03_address: 10.167.4.143
  71 +    infra_kvm_address: 172.16.10.140
  72 +    infra_kvm_node01_address: 172.16.10.141
  73 +    infra_kvm_node02_address: 172.16.10.142
  74 +    infra_kvm_node03_address: 172.16.10.143
  75
  76      infra_maas_node01_hostname: mas01
  77      infra_kvm_node01_hostname: kvm01
  78 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
  79 index e49a205..ad99447 100644
  80 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
  81 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
  82 @@ -3,9 +3,9 @@ parameters:
  83
  84      openstack_version: ocata
  85
  86 -    openstack_gateway_node01_address: 10.167.4.124
  87 -    openstack_gateway_node02_address: 10.167.4.125
  88 -    openstack_gateway_node03_address: 10.167.4.126
  89 +    openstack_gateway_node01_address: 172.16.10.124
  90 +    openstack_gateway_node02_address: 172.16.10.125
  91 +    openstack_gateway_node03_address: 172.16.10.126
  92      openstack_gateway_node01_tenant_address: 10.1.0.6
  93      openstack_gateway_node02_tenant_address: 10.1.0.7
  94      openstack_gateway_node03_tenant_address: 10.1.0.9
  95 @@ -14,21 +14,21 @@ parameters:
  96      openstack_gateway_node03_hostname: gtw03
  97
  98      # openstack service addresses
  99 -    openstack_proxy_address: 10.167.4.80
 100 -    openstack_proxy_node01_address: 10.167.4.81
 101 -    openstack_proxy_node02_address: 10.167.4.82
 102 -    openstack_control_address: 10.167.4.10
 103 -    openstack_control_node01_address: 10.167.4.11
 104 -    openstack_control_node02_address: 10.167.4.12
 105 -    openstack_control_node03_address: 10.167.4.13
 106 -    openstack_database_address: 10.167.4.50
 107 -    openstack_database_node01_address: 10.167.4.51
 108 -    openstack_database_node02_address: 10.167.4.52
 109 -    openstack_database_node03_address: 10.167.4.53
 110 -    openstack_message_queue_address: 10.167.4.40
 111 -    openstack_message_queue_node01_address: 10.167.4.41
 112 -    openstack_message_queue_node02_address: 10.167.4.42
 113 -    openstack_message_queue_node03_address: 10.167.4.43
 114 +    openstack_proxy_address: 172.16.10.80
 115 +    openstack_proxy_node01_address: 172.16.10.81
 116 +    openstack_proxy_node02_address: 172.16.10.82
 117 +    openstack_control_address: 172.16.10.10
 118 +    openstack_control_node01_address: 172.16.10.11
 119 +    openstack_control_node02_address: 172.16.10.12
 120 +    openstack_control_node03_address: 172.16.10.13
 121 +    openstack_database_address: 172.16.10.50
 122 +    openstack_database_node01_address: 172.16.10.51
 123 +    openstack_database_node02_address: 172.16.10.52
 124 +    openstack_database_node03_address: 172.16.10.53
 125 +    openstack_message_queue_address: 172.16.10.40
 126 +    openstack_message_queue_node01_address: 172.16.10.41
 127 +    openstack_message_queue_node02_address: 172.16.10.42
 128 +    openstack_message_queue_node03_address: 172.16.10.43
 129
 130
 131      openstack_telemetry_hostname: mdb
 132 @@ -36,26 +36,26 @@ parameters:
 133      openstack_telemetry_node02_hostname: mdb02
 134      openstack_telemetry_node03_hostname: mdb03
 135
 136 -    openstack_telemetry_address: 10.167.4.75
 137 -    openstack_telemetry_node01_address: 10.167.4.76
 138 -    openstack_telemetry_node02_address: 10.167.4.77
 139 -    openstack_telemetry_node03_address: 10.167.4.78
 140 +    openstack_telemetry_address: 172.16.10.75
 141 +    openstack_telemetry_node01_address: 172.16.10.76
 142 +    openstack_telemetry_node02_address: 172.16.10.77
 143 +    openstack_telemetry_node03_address: 172.16.10.78
 144
 145      # OpenStack Compute
 146 -    openstack_compute_node01_single_address: 10.167.4.101
 147 -    openstack_compute_node02_single_address: 10.167.4.102
 148 -    openstack_compute_node03_single_address: 10.167.4.103
 149 -    openstack_compute_node01_control_address: 10.167.4.101
 150 -    openstack_compute_node02_control_address: 10.167.4.102
 151 -    openstack_compute_node03_control_address: 10.167.4.103
 152 +    openstack_compute_node01_single_address: 172.16.10.101
 153 +    openstack_compute_node02_single_address: 172.16.10.102
 154 +    openstack_compute_node03_single_address: 172.16.10.103
 155 +    openstack_compute_node01_control_address: 172.16.10.101
 156 +    openstack_compute_node02_control_address: 172.16.10.102
 157 +    openstack_compute_node03_control_address: 172.16.10.103
 158      openstack_compute_node01_tenant_address: 10.1.0.101
 159      openstack_compute_node02_tenant_address: 10.1.0.102
 160      openstack_compute_node03_tenant_address: 10.1.0.103
 161 -    openstack_compute_node01_external_address: 172.30.10.2
 162 -    openstack_compute_node02_external_address: 172.30.10.3
 163 +    openstack_compute_node01_external_address: 10.0.8.101
 164 +    openstack_compute_node02_external_address: 10.0.8.102
 165
 166      # opendaylight options
 167 -    opendaylight_server_node01_single_address: 10.167.4.111
 168 +    opendaylight_server_node01_single_address: 172.16.10.111
 169      opendaylight_service_host: ${_param:opendaylight_server_node01_single_address}
 170      opendaylight_server_node01_hostname: odl01
 171      opendaylight_router: odl-router_v2
 172 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
 173 index 93e2de0..1d75356 100644
 174 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
 175 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
 176 @@ -16,19 +16,19 @@ parameters:
 177      infra_maas_database_password: opnfv_secret
 178
 179      # infra service addresses
 180 -    infra_config_address: 10.167.4.100
 181 +    infra_config_address: 172.16.10.100
 182      infra_config_deploy_address: 192.168.10.100
 183 -    infra_maas_node01_address: 10.167.4.3
 184 -    infra_maas_node01_deploy_address: 192.168.11.3
 185 -    infra_maas_node01_external_address: 10.16.0.3
 186 -    infra_compute_node01_address: 10.167.4.141
 187 -    infra_compute_node02_address: 10.167.4.142
 188 -    infra_compute_node03_address: 10.167.4.143
 189 +    infra_maas_node01_address: 172.16.10.2
 190 +    infra_maas_node01_deploy_address: 192.168.11.2
 191 +    infra_maas_node01_external_address: 10.0.8.2
 192 +    infra_compute_node01_address: 172.16.10.141
 193 +    infra_compute_node02_address: 172.16.10.142
 194 +    infra_compute_node03_address: 172.16.10.143
 195
 196 -    infra_kvm_address: 10.167.4.140
 197 -    infra_kvm_node01_address: 10.167.4.141
 198 -    infra_kvm_node02_address: 10.167.4.142
 199 -    infra_kvm_node03_address: 10.167.4.143
 200 +    infra_kvm_address: 172.16.10.140
 201 +    infra_kvm_node01_address: 172.16.10.141
 202 +    infra_kvm_node02_address: 172.16.10.142
 203 +    infra_kvm_node03_address: 172.16.10.143
 204
 205      infra_maas_node01_hostname: mas01
 206      infra_kvm_node01_hostname: kvm01
 207 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
 208 index 9c2bc7b..90e0cf3 100644
 209 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml
 210 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml
 211 @@ -3,9 +3,9 @@ parameters:
 212
 213      openstack_version: ocata
 214
 215 -    openstack_gateway_node01_address: 10.167.4.124
 216 -    openstack_gateway_node02_address: 10.167.4.125
 217 -    openstack_gateway_node03_address: 10.167.4.126
 218 +    openstack_gateway_node01_address: 172.16.10.124
 219 +    openstack_gateway_node02_address: 172.16.10.125
 220 +    openstack_gateway_node03_address: 172.16.10.126
 221      openstack_gateway_node01_tenant_address: 10.1.0.6
 222      openstack_gateway_node02_tenant_address: 10.1.0.7
 223      openstack_gateway_node03_tenant_address: 10.1.0.9
 224 @@ -14,21 +14,21 @@ parameters:
 225      openstack_gateway_node03_hostname: gtw03
 226
 227      # openstack service addresses
 228 -    openstack_proxy_address: 10.167.4.80
 229 -    openstack_proxy_node01_address: 10.167.4.81
 230 -    openstack_proxy_node02_address: 10.167.4.82
 231 -    openstack_control_address: 10.167.4.10
 232 -    openstack_control_node01_address: 10.167.4.11
 233 -    openstack_control_node02_address: 10.167.4.12
 234 -    openstack_control_node03_address: 10.167.4.13
 235 -    openstack_database_address: 10.167.4.50
 236 -    openstack_database_node01_address: 10.167.4.51
 237 -    openstack_database_node02_address: 10.167.4.52
 238 -    openstack_database_node03_address: 10.167.4.53
 239 -    openstack_message_queue_address: 10.167.4.40
 240 -    openstack_message_queue_node01_address: 10.167.4.41
 241 -    openstack_message_queue_node02_address: 10.167.4.42
 242 -    openstack_message_queue_node03_address: 10.167.4.43
 243 +    openstack_proxy_address: 172.16.10.80
 244 +    openstack_proxy_node01_address: 172.16.10.81
 245 +    openstack_proxy_node02_address: 172.16.10.82
 246 +    openstack_control_address: 172.16.10.10
 247 +    openstack_control_node01_address: 172.16.10.11
 248 +    openstack_control_node02_address: 172.16.10.12
 249 +    openstack_control_node03_address: 172.16.10.13
 250 +    openstack_database_address: 172.16.10.50
 251 +    openstack_database_node01_address: 172.16.10.51
 252 +    openstack_database_node02_address: 172.16.10.52
 253 +    openstack_database_node03_address: 172.16.10.53
 254 +    openstack_message_queue_address: 172.16.10.40
 255 +    openstack_message_queue_node01_address: 172.16.10.41
 256 +    openstack_message_queue_node02_address: 172.16.10.42
 257 +    openstack_message_queue_node03_address: 172.16.10.43
 258
 259
 260      openstack_telemetry_hostname: mdb
 261 @@ -36,23 +36,23 @@ parameters:
 262      openstack_telemetry_node02_hostname: mdb02
 263      openstack_telemetry_node03_hostname: mdb03
 264
 265 -    openstack_telemetry_address: 10.167.4.75
 266 -    openstack_telemetry_node01_address: 10.167.4.76
 267 -    openstack_telemetry_node02_address: 10.167.4.77
 268 -    openstack_telemetry_node03_address: 10.167.4.78
 269 +    openstack_telemetry_address: 172.16.10.75
 270 +    openstack_telemetry_node01_address: 172.16.10.76
 271 +    openstack_telemetry_node02_address: 172.16.10.77
 272 +    openstack_telemetry_node03_address: 172.16.10.78
 273
 274      # OpenStack Compute
 275 -    openstack_compute_node01_single_address: 10.167.4.101
 276 -    openstack_compute_node02_single_address: 10.167.4.102
 277 -    openstack_compute_node03_single_address: 10.167.4.103
 278 -    openstack_compute_node01_control_address: 10.167.4.101
 279 -    openstack_compute_node02_control_address: 10.167.4.102
 280 -    openstack_compute_node03_control_address: 10.167.4.103
 281 +    openstack_compute_node01_single_address: 172.16.10.101
 282 +    openstack_compute_node02_single_address: 172.16.10.102
 283 +    openstack_compute_node03_single_address: 172.16.10.103
 284 +    openstack_compute_node01_control_address: 172.16.10.101
 285 +    openstack_compute_node02_control_address: 172.16.10.102
 286 +    openstack_compute_node03_control_address: 172.16.10.103
 287      openstack_compute_node01_tenant_address: 10.1.0.101
 288      openstack_compute_node02_tenant_address: 10.1.0.102
 289      openstack_compute_node03_tenant_address: 10.1.0.103
 290 -    openstack_compute_node01_external_address: 172.30.10.2
 291 -    openstack_compute_node02_external_address: 172.30.10.3
 292 +    openstack_compute_node01_external_address: 10.0.8.101
 293 +    openstack_compute_node02_external_address: 10.0.8.102
 294
 295      # openstack service hostnames
 296      openstack_proxy_hostname: prx