From 8bdc4f87ac1e5a1630b028d33364e92232e991bd Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 24 Aug 2017 18:00:25 +0200 Subject: p/fuel: Bring in Opendaylight support Change-Id: I3d3e729447a4d8e79fce486a7fc68f8f72675e3c Signed-off-by: Alexandru Avadanii --- ...twork-public-mgmt-Use-arm-pod3-POD-config.patch | 135 ++++++++++++++++++++- 1 file changed, 133 insertions(+), 2 deletions(-) (limited to 'patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch') diff --git a/patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch b/patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch index bbfaf5e3..4a159446 100644 --- a/patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch +++ b/patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch @@ -8,9 +8,11 @@ Signed-off-by: Alexandru Avadanii --- ci/deploy.sh | 2 +- mcp/config/states/maas | 2 +- + .../baremetal-mcp-ocata-odl-ha/infra/init.yml | 22 ++++---- + .../baremetal-mcp-ocata-odl-ha/openstack/init.yml | 62 +++++++++++----------- .../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(-) + .../baremetal-mcp-ocata-ovs-ha/openstack/init.yml | 60 ++++++++++----------- + 6 files changed, 85 insertions(+), 85 deletions(-) diff --git a/ci/deploy.sh b/ci/deploy.sh index f51ba5f..5582727 100755 @@ -38,6 +40,135 @@ index 1e14e5f..db0241b 100755 wait_for 10 "salt -C 'mas01*' state.apply maas.region" +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 ab14c58..25746b5 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 +@@ -16,19 +16,19 @@ 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: 192.168.10.100 +- infra_maas_node01_address: 10.167.4.3 +- infra_maas_node01_deploy_address: 192.168.11.3 +- infra_maas_node01_external_address: 10.16.0.3 +- 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_maas_node01_address: 172.16.10.2 ++ infra_maas_node01_deploy_address: 192.168.11.2 ++ infra_maas_node01_external_address: 10.0.8.2 ++ 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 e49a205..ad99447 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 +@@ -3,9 +3,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 +@@ -14,21 +14,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 +@@ -36,26 +36,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 + opendaylight_service_host: ${_param:opendaylight_server_node01_single_address} + opendaylight_server_node01_hostname: odl01 + opendaylight_router: odl-router_v2 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 index 93e2de0..1d75356 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml -- cgit 1.2.3-korg