diff options
Diffstat (limited to 'patches/opnfv-fuel/0011-network-public-mgmt-Use-arm-pod3-POD-config.patch')
| -rw-r--r-- | patches/opnfv-fuel/0011-network-public-mgmt-Use-arm-pod3-POD-config.patch | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/patches/opnfv-fuel/0011-network-public-mgmt-Use-arm-pod3-POD-config.patch b/patches/opnfv-fuel/0011-network-public-mgmt-Use-arm-pod3-POD-config.patch index ab078c26..95e39265 100644 --- a/patches/opnfv-fuel/0011-network-public-mgmt-Use-arm-pod3-POD-config.patch +++ b/patches/opnfv-fuel/0011-network-public-mgmt-Use-arm-pod3-POD-config.patch @@ -5,13 +5,12 @@ 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(-) + .../baremetal-mcp-ocata-ovs-ha/infra/init.yml | 22 ++++---- + .../baremetal-mcp-ocata-ovs-ha/openstack/init.yml | 60 +++++++++++----------- + 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/ci/deploy.sh b/ci/deploy.sh index cf7b3b3..2b4e724 100755 @@ -27,7 +26,7 @@ index cf7b3b3..2b4e724 100755 # 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 99d923b..13a8263 100755 +index 9a27a39..f83f4a7 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas @@ -20,7 +20,7 @@ salt -C 'mas01*' state.apply linux.network.interface @@ -75,7 +74,7 @@ index 93e2de0..1d75356 100644 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 +index 9c2bc7b..90e0cf3 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: @@ -128,7 +127,7 @@ index 4036be1..dce7fb7 100644 openstack_telemetry_hostname: mdb -@@ -36,18 +36,18 @@ parameters: +@@ -36,23 +36,23 @@ parameters: openstack_telemetry_node02_hostname: mdb02 openstack_telemetry_node03_hostname: mdb03 @@ -157,3 +156,10 @@ index 4036be1..dce7fb7 100644 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 +- openstack_compute_node01_external_address: 172.30.10.2 +- openstack_compute_node02_external_address: 172.30.10.3 ++ openstack_compute_node01_external_address: 10.0.8.101 ++ openstack_compute_node02_external_address: 10.0.8.102 + + # openstack service hostnames + openstack_proxy_hostname: prx |