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

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