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