From c7a7d5b4ea00f043d17c13248cb3aa5f37f2058e Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 28 Sep 2017 05:27:48 +0200 Subject: u/fuel: Bump & rebase for MaaS missing inc fixup Change-Id: I041d51eeebfe77aee9a519584f6cfb6f7b740e93 Signed-off-by: Alexandru Avadanii (cherry picked from commit a6f17c731f081664fa8c62389669b56b5e8b7c2e) --- ...s-baremetal-AArch64-virtio-NIC-names-sync.patch | 8 +- ...ib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch | 2 +- ...d_config.yml-Use-arm-pod5-specific-config.patch | 178 --------------------- upstream/fuel | 2 +- 4 files changed, 6 insertions(+), 184 deletions(-) delete mode 100644 patches/opnfv-fuel/0016-pod_config.yml-Use-arm-pod5-specific-config.patch diff --git a/patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch b/patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch index 8fc33614..f331bf84 100644 --- a/patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch +++ b/patches/opnfv-fuel/0004-classes-baremetal-AArch64-virtio-NIC-names-sync.patch @@ -120,10 +120,10 @@ index da26254..5e4ea66 100644 - - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan} + - ${_param:trunk_nic}.${_param:opnfv_net_mgmt_vlan} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml -index cbb1caf..e54621c 100644 +index 0900b65..a8c6d81 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml -@@ -5,9 +5,9 @@ classes: +@@ -6,9 +6,9 @@ classes: - cluster.baremetal-mcp-ocata-odl-ha.infra parameters: _param: @@ -403,10 +403,10 @@ index 9e023e3..95bacb2 100644 - - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan} + - ${_param:trunk_nic}.${_param:opnfv_net_mgmt_vlan} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml -index 2922fa3..99ca6ce 100644 +index bf57837..86b2f94 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml -@@ -5,9 +5,9 @@ classes: +@@ -6,9 +6,9 @@ classes: - cluster.baremetal-mcp-ocata-ovs-ha.infra parameters: _param: diff --git a/patches/opnfv-fuel/0012-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch b/patches/opnfv-fuel/0012-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch index d6c0b9d1..c876fbd6 100644 --- a/patches/opnfv-fuel/0012-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch +++ b/patches/opnfv-fuel/0012-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch @@ -31,7 +31,7 @@ Signed-off-by: Alexandru Avadanii 1 file changed, 10 insertions(+) diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh -index 4b88ab7..90ab8c5 100644 +index dc4d9dc..04ce005 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh @@ -28,6 +28,15 @@ get_base_image() { diff --git a/patches/opnfv-fuel/0016-pod_config.yml-Use-arm-pod5-specific-config.patch b/patches/opnfv-fuel/0016-pod_config.yml-Use-arm-pod5-specific-config.patch deleted file mode 100644 index cecabe84..00000000 --- a/patches/opnfv-fuel/0016-pod_config.yml-Use-arm-pod5-specific-config.patch +++ /dev/null @@ -1,178 +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 -Date: Tue, 19 Sep 2017 16:51:21 +0200 -Subject: [PATCH] pod_config.yml: Use arm-pod5 specific config - -Signed-off-by: Alexandru Avadanii ---- - .../all-mcp-ocata-common/opnfv/pod_config.yml | 126 ++++++++++----------- - 1 file changed, 63 insertions(+), 63 deletions(-) - -diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml -index ecc8dad..1775ea4 100644 ---- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml -+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml -@@ -2,93 +2,93 @@ - parameters: - _param: - # infra service addresses -- opnfv_infra_config_address: 10.167.4.100 -- opnfv_infra_config_deploy_address: 10.20.0.2 -- opnfv_infra_maas_node01_address: 10.167.4.3 -+ opnfv_infra_config_address: 172.16.10.100 -+ opnfv_infra_maas_node01_address: 172.16.10.3 - opnfv_infra_maas_node01_deploy_address: 192.168.11.3 -- opnfv_infra_compute_node01_address: 10.167.4.141 -- opnfv_infra_compute_node02_address: 10.167.4.142 -- opnfv_infra_compute_node03_address: 10.167.4.143 -- opnfv_infra_kvm_address: 10.167.4.140 -- opnfv_infra_kvm_node01_address: 10.167.4.141 -- opnfv_infra_kvm_node02_address: 10.167.4.142 -- opnfv_infra_kvm_node03_address: 10.167.4.143 -+ opnfv_infra_compute_node01_address: 172.16.10.141 -+ opnfv_infra_compute_node02_address: 172.16.10.142 -+ opnfv_infra_compute_node03_address: 172.16.10.143 -+ opnfv_infra_kvm_address: 172.16.10.140 -+ opnfv_infra_kvm_node01_address: 172.16.10.141 -+ opnfv_infra_kvm_node02_address: 172.16.10.142 -+ opnfv_infra_kvm_node03_address: 172.16.10.143 - -- opnfv_openstack_gateway_node01_address: 10.167.4.124 -- opnfv_openstack_gateway_node02_address: 10.167.4.125 -- opnfv_openstack_gateway_node03_address: 10.167.4.126 -+ opnfv_openstack_gateway_node01_address: 172.16.10.124 -+ opnfv_openstack_gateway_node02_address: 172.16.10.125 -+ opnfv_openstack_gateway_node03_address: 172.16.10.126 - opnfv_openstack_gateway_node01_tenant_address: 10.1.0.6 - opnfv_openstack_gateway_node02_tenant_address: 10.1.0.7 - opnfv_openstack_gateway_node03_tenant_address: 10.1.0.9 -- opnfv_openstack_proxy_address: 10.167.4.80 -- opnfv_openstack_proxy_node01_address: 10.167.4.81 -- opnfv_openstack_proxy_node02_address: 10.167.4.82 -- opnfv_openstack_control_address: 10.167.4.10 -- opnfv_openstack_control_node01_address: 10.167.4.11 -- opnfv_openstack_control_node02_address: 10.167.4.12 -- opnfv_openstack_control_node03_address: 10.167.4.13 -- opnfv_openstack_database_address: 10.167.4.50 -- opnfv_openstack_database_node01_address: 10.167.4.51 -- opnfv_openstack_database_node02_address: 10.167.4.52 -- opnfv_openstack_database_node03_address: 10.167.4.53 -- opnfv_openstack_message_queue_address: 10.167.4.40 -- opnfv_openstack_message_queue_node01_address: 10.167.4.41 -- opnfv_openstack_message_queue_node02_address: 10.167.4.42 -- opnfv_openstack_message_queue_node03_address: 10.167.4.43 -- opnfv_openstack_telemetry_address: 10.167.4.75 -- opnfv_openstack_telemetry_node01_address: 10.167.4.76 -- opnfv_openstack_telemetry_node02_address: 10.167.4.77 -- opnfv_openstack_telemetry_node03_address: 10.167.4.78 -- opnfv_openstack_compute_node01_single_address: 10.167.4.101 -- opnfv_openstack_compute_node02_single_address: 10.167.4.102 -- opnfv_openstack_compute_node03_single_address: 10.167.4.103 -- opnfv_openstack_compute_node01_control_address: 10.167.4.101 -- opnfv_openstack_compute_node02_control_address: 10.167.4.102 -- opnfv_openstack_compute_node03_control_address: 10.167.4.103 -+ opnfv_openstack_proxy_address: 172.16.10.80 -+ opnfv_openstack_proxy_node01_address: 172.16.10.81 -+ opnfv_openstack_proxy_node02_address: 172.16.10.82 -+ opnfv_openstack_control_address: 172.16.10.10 -+ opnfv_openstack_control_node01_address: 172.16.10.11 -+ opnfv_openstack_control_node02_address: 172.16.10.12 -+ opnfv_openstack_control_node03_address: 172.16.10.13 -+ opnfv_openstack_database_address: 172.16.10.50 -+ opnfv_openstack_database_node01_address: 172.16.10.51 -+ opnfv_openstack_database_node02_address: 172.16.10.52 -+ opnfv_openstack_database_node03_address: 172.16.10.53 -+ opnfv_openstack_message_queue_address: 172.16.10.40 -+ opnfv_openstack_message_queue_node01_address: 172.16.10.41 -+ opnfv_openstack_message_queue_node02_address: 172.16.10.42 -+ opnfv_openstack_message_queue_node03_address: 172.16.10.43 -+ opnfv_openstack_telemetry_address: 172.16.10.75 -+ opnfv_openstack_telemetry_node01_address: 172.16.10.76 -+ opnfv_openstack_telemetry_node02_address: 172.16.10.77 -+ opnfv_openstack_telemetry_node03_address: 172.16.10.78 -+ opnfv_openstack_compute_node01_single_address: 172.16.10.101 -+ opnfv_openstack_compute_node02_single_address: 172.16.10.102 -+ opnfv_openstack_compute_node03_single_address: 172.16.10.103 -+ opnfv_openstack_compute_node01_control_address: 172.16.10.101 -+ opnfv_openstack_compute_node02_control_address: 172.16.10.102 -+ opnfv_openstack_compute_node03_control_address: 172.16.10.103 - opnfv_openstack_compute_node01_tenant_address: 10.1.0.101 - opnfv_openstack_compute_node02_tenant_address: 10.1.0.102 - opnfv_openstack_compute_node03_tenant_address: 10.1.0.103 -- opnfv_openstack_compute_node01_external_address: 172.30.10.2 -- opnfv_openstack_compute_node02_external_address: 172.30.10.3 -+ opnfv_openstack_compute_node01_external_address: 10.0.8.101 -+ opnfv_openstack_compute_node02_external_address: 10.0.8.102 - -- opnfv_opendaylight_server_node01_single_address: 10.167.4.111 -+ # opendaylight options -+ opnfv_opendaylight_server_node01_single_address: 172.16.10.111 - - opnfv_name_servers: ['8.8.8.8', '8.8.4.4'] - opnfv_dns_server01: '8.8.8.8' -- opnfv_net_mgmt_vlan: 300 -- opnfv_net_tenant_vlan: 302 -+ opnfv_net_mgmt_vlan: 2183 -+ opnfv_net_tenant_vlan: 2185 - -- opnfv_maas_node01_architecture: amd64/generic -- opnfv_maas_node01_power_address: 172.30.8.75 -+ opnfv_maas_node01_architecture: 'arm64/generic' -+ opnfv_maas_node01_power_address: 10.0.8.3 - opnfv_maas_node01_power_type: ipmi - opnfv_maas_node01_power_user: admin -- opnfv_maas_node01_power_password: octopus -- opnfv_maas_node01_interface_mac: "00:25:b5:a0:00:2a" -+ opnfv_maas_node01_power_password: admin -+ opnfv_maas_node01_interface_mac: 'e0:ff:f7:00:08:ae' - -- opnfv_maas_node02_architecture: amd64/generic -- opnfv_maas_node02_power_address: 172.30.8.65 -+ opnfv_maas_node02_architecture: 'arm64/generic' -+ opnfv_maas_node02_power_address: 10.0.8.4 - opnfv_maas_node02_power_type: ipmi - opnfv_maas_node02_power_user: admin -- opnfv_maas_node02_power_password: octopus -- opnfv_maas_node02_interface_mac: "00:25:b5:a0:00:3a" -+ opnfv_maas_node02_power_password: admin -+ opnfv_maas_node02_interface_mac: 'e0:ff:f7:00:08:b1' - -- opnfv_maas_node03_architecture: amd64/generic -- opnfv_maas_node03_power_address: 172.30.8.74 -+ opnfv_maas_node03_architecture: 'arm64/generic' -+ opnfv_maas_node03_power_address: 10.0.8.5 - opnfv_maas_node03_power_type: ipmi - opnfv_maas_node03_power_user: admin -- opnfv_maas_node03_power_password: octopus -- opnfv_maas_node03_interface_mac: "00:25:b5:a0:00:4a" -+ opnfv_maas_node03_power_password: admin -+ opnfv_maas_node03_interface_mac: 'e0:ff:f7:00:08:bd' - -- opnfv_maas_node04_architecture: amd64/generic -- opnfv_maas_node04_power_address: 172.30.8.73 -+ opnfv_maas_node04_architecture: 'arm64/generic' -+ opnfv_maas_node04_power_address: 10.0.8.6 - opnfv_maas_node04_power_type: ipmi - opnfv_maas_node04_power_user: admin -- opnfv_maas_node04_power_password: octopus -- opnfv_maas_node04_interface_mac: "00:25:b5:a0:00:5a" -+ opnfv_maas_node04_power_password: admin -+ opnfv_maas_node04_interface_mac: 'e0:ff:f7:00:08:c6' - -- opnfv_maas_node05_architecture: amd64/generic -- opnfv_maas_node05_power_address: 172.30.8.72 -+ opnfv_maas_node05_architecture: 'arm64/generic' -+ opnfv_maas_node05_power_address: 10.0.8.7 - opnfv_maas_node05_power_type: ipmi - opnfv_maas_node05_power_user: admin -- opnfv_maas_node05_power_password: octopus -- opnfv_maas_node05_interface_mac: "00:25:b5:a0:00:6a" -+ opnfv_maas_node05_power_password: admin -+ opnfv_maas_node05_interface_mac: 'e0:ff:f7:00:08:cf' diff --git a/upstream/fuel b/upstream/fuel index d02f6752..4b2dfa55 160000 --- a/upstream/fuel +++ b/upstream/fuel @@ -1 +1 @@ -Subproject commit d02f6752929c0c38a7890c6f496102076bfe6afa +Subproject commit 4b2dfa552656def5f56a48229705e79c5c7bcfca -- cgit 1.2.3-korg