diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-26 18:22:06 +0200 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-26 18:32:50 +0200 |
commit | 62d2ed716e79f9ee75d63543249bb21b9115b032 (patch) | |
tree | 1858f8f17f308a94ab6fbdce65858eb314aee01d /patches/opnfv-fuel/0006-network-public-mgmt-Use-arm-pod3-POD-config.patch | |
parent | 6dcb09998dae3c3f2a55fc5169fe7dc9010f8a0f (diff) |
u/fuel: Bump & rebase for full PDF support
Change-Id: I7ae833b429c018345d0ab061877d27e3183b3dc7
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0006-network-public-mgmt-Use-arm-pod3-POD-config.patch')
-rw-r--r-- | patches/opnfv-fuel/0006-network-public-mgmt-Use-arm-pod3-POD-config.patch | 144 |
1 files changed, 0 insertions, 144 deletions
diff --git a/patches/opnfv-fuel/0006-network-public-mgmt-Use-arm-pod3-POD-config.patch b/patches/opnfv-fuel/0006-network-public-mgmt-Use-arm-pod3-POD-config.patch deleted file mode 100644 index e235d866..00000000 --- a/patches/opnfv-fuel/0006-network-public-mgmt-Use-arm-pod3-POD-config.patch +++ /dev/null @@ -1,144 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2017 Enea AB and others. -: -: All rights reserved. This program and the accompanying materials -: are made available under the terms of the Apache License, Version 2.0 -: which accompanies this distribution, and is available at -: http://www.apache.org/licenses/LICENSE-2.0 -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -Date: Tue, 8 Aug 2017 03:49:53 +0200 -Subject: [PATCH] network: public, mgmt: Use arm-pod3 POD config - -Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ---- - .../baremetal-mcp-ocata-odl-ha/infra/init.yml | 18 +++---- - .../baremetal-mcp-ocata-odl-ha/openstack/init.yml | 62 +++++++++++----------- - 2 files changed, 40 insertions(+), 40 deletions(-) - -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 -index b1cd5d2..50c590d 100644 ---- 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 -@@ -18,18 +18,18 @@ parameters: - infra_maas_database_password: opnfv_secret - - # infra service addresses -- infra_config_address: 10.167.4.100 -+ infra_config_address: 172.16.10.100 - infra_config_deploy_address: 10.20.0.2 -- infra_maas_node01_address: 10.167.4.3 -+ infra_maas_node01_address: 172.16.10.3 - infra_maas_node01_deploy_address: ${_param:opnfv_maas_pxe_address} -- infra_compute_node01_address: 10.167.4.141 -- infra_compute_node02_address: 10.167.4.142 -- infra_compute_node03_address: 10.167.4.143 -+ infra_compute_node01_address: 172.16.10.141 -+ infra_compute_node02_address: 172.16.10.142 -+ infra_compute_node03_address: 172.16.10.143 - -- infra_kvm_address: 10.167.4.140 -- infra_kvm_node01_address: 10.167.4.141 -- infra_kvm_node02_address: 10.167.4.142 -- infra_kvm_node03_address: 10.167.4.143 -+ infra_kvm_address: 172.16.10.140 -+ infra_kvm_node01_address: 172.16.10.141 -+ infra_kvm_node02_address: 172.16.10.142 -+ infra_kvm_node03_address: 172.16.10.143 - - infra_maas_node01_hostname: mas01 - infra_kvm_node01_hostname: kvm01 -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 -index 16bdc06..e288322 100644 ---- 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 -@@ -4,9 +4,9 @@ parameters: - - openstack_version: ocata - -- openstack_gateway_node01_address: 10.167.4.124 -- openstack_gateway_node02_address: 10.167.4.125 -- openstack_gateway_node03_address: 10.167.4.126 -+ openstack_gateway_node01_address: 172.16.10.124 -+ openstack_gateway_node02_address: 172.16.10.125 -+ openstack_gateway_node03_address: 172.16.10.126 - openstack_gateway_node01_tenant_address: 10.1.0.6 - openstack_gateway_node02_tenant_address: 10.1.0.7 - openstack_gateway_node03_tenant_address: 10.1.0.9 -@@ -15,21 +15,21 @@ parameters: - openstack_gateway_node03_hostname: gtw03 - - # openstack service addresses -- openstack_proxy_address: 10.167.4.80 -- openstack_proxy_node01_address: 10.167.4.81 -- openstack_proxy_node02_address: 10.167.4.82 -- openstack_control_address: 10.167.4.10 -- openstack_control_node01_address: 10.167.4.11 -- openstack_control_node02_address: 10.167.4.12 -- openstack_control_node03_address: 10.167.4.13 -- openstack_database_address: 10.167.4.50 -- openstack_database_node01_address: 10.167.4.51 -- openstack_database_node02_address: 10.167.4.52 -- openstack_database_node03_address: 10.167.4.53 -- openstack_message_queue_address: 10.167.4.40 -- openstack_message_queue_node01_address: 10.167.4.41 -- openstack_message_queue_node02_address: 10.167.4.42 -- openstack_message_queue_node03_address: 10.167.4.43 -+ openstack_proxy_address: 172.16.10.80 -+ openstack_proxy_node01_address: 172.16.10.81 -+ openstack_proxy_node02_address: 172.16.10.82 -+ openstack_control_address: 172.16.10.10 -+ openstack_control_node01_address: 172.16.10.11 -+ openstack_control_node02_address: 172.16.10.12 -+ openstack_control_node03_address: 172.16.10.13 -+ openstack_database_address: 172.16.10.50 -+ openstack_database_node01_address: 172.16.10.51 -+ openstack_database_node02_address: 172.16.10.52 -+ openstack_database_node03_address: 172.16.10.53 -+ openstack_message_queue_address: 172.16.10.40 -+ openstack_message_queue_node01_address: 172.16.10.41 -+ openstack_message_queue_node02_address: 172.16.10.42 -+ openstack_message_queue_node03_address: 172.16.10.43 - - - openstack_telemetry_hostname: mdb -@@ -37,26 +37,26 @@ parameters: - openstack_telemetry_node02_hostname: mdb02 - openstack_telemetry_node03_hostname: mdb03 - -- openstack_telemetry_address: 10.167.4.75 -- openstack_telemetry_node01_address: 10.167.4.76 -- openstack_telemetry_node02_address: 10.167.4.77 -- openstack_telemetry_node03_address: 10.167.4.78 -+ openstack_telemetry_address: 172.16.10.75 -+ openstack_telemetry_node01_address: 172.16.10.76 -+ openstack_telemetry_node02_address: 172.16.10.77 -+ openstack_telemetry_node03_address: 172.16.10.78 - - # OpenStack Compute -- openstack_compute_node01_single_address: 10.167.4.101 -- openstack_compute_node02_single_address: 10.167.4.102 -- openstack_compute_node03_single_address: 10.167.4.103 -- openstack_compute_node01_control_address: 10.167.4.101 -- openstack_compute_node02_control_address: 10.167.4.102 -- openstack_compute_node03_control_address: 10.167.4.103 -+ openstack_compute_node01_single_address: 172.16.10.101 -+ openstack_compute_node02_single_address: 172.16.10.102 -+ openstack_compute_node03_single_address: 172.16.10.103 -+ openstack_compute_node01_control_address: 172.16.10.101 -+ openstack_compute_node02_control_address: 172.16.10.102 -+ openstack_compute_node03_control_address: 172.16.10.103 - 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 - - # opendaylight options -- opendaylight_server_node01_single_address: 10.167.4.111 -+ opendaylight_server_node01_single_address: 172.16.10.111 - # yamllint disable rule:line-length - opendaylight_service_host: ${_param:opendaylight_server_node01_single_address} - opendaylight_server_node01_hostname: odl01 |