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