From d81ba0acaf68ad4d5e8db943395431558d77b638 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 11 Aug 2017 15:45:17 +0200 Subject: p/fuel: Rebase after lib.sh VGA patch got upstream Change-Id: Ibf6f633873e7dce9c38f6952710b7937b1290ac3 Signed-off-by: Alexandru Avadanii --- ....sh-AArch64-Use-VGA-video-mode-for-guests.patch | 65 ---- ...alt.sh-user-data-Add-Saltstack-arm64-repo.patch | 45 +++ ...ses-virtual-AArch64-virtio-NIC-names-sync.patch | 425 +++++++++++++++++++++ ...alt.sh-user-data-Add-Saltstack-arm64-repo.patch | 45 --- ...ses-virtual-AArch64-virtio-NIC-names-sync.patch | 425 --------------------- ...-salt-formulas-Add-enable-armband-formula.patch | 178 +++++++++ ...-salt-formulas-Add-enable-armband-formula.patch | 178 --------- ...etwork-public-Use-arm-virtual2-POD-config.patch | 167 ++++++++ ...alt-formulas-opendaylight-AArch64-leveldb.patch | 40 ++ ...etwork-public-Use-arm-virtual2-POD-config.patch | 167 -------- ...alt-formulas-opendaylight-AArch64-leveldb.patch | 40 -- 11 files changed, 855 insertions(+), 920 deletions(-) delete mode 100644 patches/opnfv-fuel/0002-lib.sh-AArch64-Use-VGA-video-mode-for-guests.patch create mode 100644 patches/opnfv-fuel/0002-salt.sh-user-data-Add-Saltstack-arm64-repo.patch create mode 100644 patches/opnfv-fuel/0003-classes-virtual-AArch64-virtio-NIC-names-sync.patch delete mode 100644 patches/opnfv-fuel/0003-salt.sh-user-data-Add-Saltstack-arm64-repo.patch delete mode 100644 patches/opnfv-fuel/0004-classes-virtual-AArch64-virtio-NIC-names-sync.patch create mode 100644 patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch delete mode 100644 patches/opnfv-fuel/0005-mcp-salt-formulas-Add-enable-armband-formula.patch create mode 100644 patches/opnfv-fuel/0005-network-public-Use-arm-virtual2-POD-config.patch create mode 100644 patches/opnfv-fuel/0006-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch delete mode 100644 patches/opnfv-fuel/0006-network-public-Use-arm-virtual2-POD-config.patch delete mode 100644 patches/opnfv-fuel/0007-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch diff --git a/patches/opnfv-fuel/0002-lib.sh-AArch64-Use-VGA-video-mode-for-guests.patch b/patches/opnfv-fuel/0002-lib.sh-AArch64-Use-VGA-video-mode-for-guests.patch deleted file mode 100644 index 7be7e52a..00000000 --- a/patches/opnfv-fuel/0002-lib.sh-AArch64-Use-VGA-video-mode-for-guests.patch +++ /dev/null @@ -1,65 +0,0 @@ -From: Alexandru Avadanii -Date: Tue, 11 Jul 2017 18:35:40 +0200 -Subject: [PATCH] lib.sh: AArch64: Use VGA video mode for guests - -On AArch64, there is no Cirrus video, so use VGA mode instead. -For now, we install vgabios package no matter the arch, although -it is only used on AArch64. - -On Debian systems, also fix a missing link for vgabios-stdvga.bin. -Based on previous Armband work from [1]. - -[1] https://github.com/opnfv/armband/blob/danube.2.0/patches/fuel-library/ - arm64-bug-fixes/0002-Install-vgabios-and-link-for-aarch64.patch - -Signed-off-by: Alexandru Avadanii ---- - ci/deploy.sh | 5 +++-- - mcp/scripts/lib.sh | 10 +++++++++- - 2 files changed, 12 insertions(+), 3 deletions(-) - -diff --git a/ci/deploy.sh b/ci/deploy.sh -index 7b3bf54..491b955 100755 ---- a/ci/deploy.sh -+++ b/ci/deploy.sh -@@ -279,9 +279,10 @@ pushd "${DEPLOY_DIR}" > /dev/null - - # Install required packages - [ -n "$(command -v apt-get)" ] && sudo apt-get install -y \ -- git make rsync mkisofs curl virtinst cpu-checker qemu-kvm -+ git make rsync mkisofs curl virtinst cpu-checker qemu-kvm vgabios && \ -+ sudo ln -sf /usr/share/vgabios/vgabios.bin /usr/share/qemu/vgabios-stdvga.bin - [ -n "$(command -v yum)" ] && sudo yum install -y \ -- git make rsync genisoimage curl virt-install qemu-kvm -+ git make rsync genisoimage curl virt-install qemu-kvm vgabios - - # Check scenario file existence - if [[ ! -f ../config/scenario/${DEPLOY_TYPE}/${DEPLOY_SCENARIO}.yaml ]]; then -diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh -index 33dba3c..8d45100 100644 ---- a/mcp/scripts/lib.sh -+++ b/mcp/scripts/lib.sh -@@ -78,6 +78,13 @@ create_vms() { - net_args="${net_args} --network ${net_type}=${net},model=virtio" - done - -+ # AArch64: prepare arch specific arguments -+ local virt_extra_args="" -+ if [ "$(uname -i)" = "aarch64" ]; then -+ # No Cirrus VGA on AArch64, use vga std -+ virt_extra_args="$virt_extra_args --video=vga" -+ fi -+ - # create vms with specified options - for node in "${vnodes[@]}"; do - # shellcheck disable=SC2086 -@@ -88,7 +95,8 @@ create_vms() { - --os-type linux --os-variant none \ - --boot hd --vnc --console pty --autostart --noreboot \ - --disk path="$(pwd)/images/mcp_${node}.iso",device=cdrom \ -- --noautoconsole -+ --noautoconsole \ -+ ${virt_extra_args} - done - } - diff --git a/patches/opnfv-fuel/0002-salt.sh-user-data-Add-Saltstack-arm64-repo.patch b/patches/opnfv-fuel/0002-salt.sh-user-data-Add-Saltstack-arm64-repo.patch new file mode 100644 index 00000000..43fe78af --- /dev/null +++ b/patches/opnfv-fuel/0002-salt.sh-user-data-Add-Saltstack-arm64-repo.patch @@ -0,0 +1,45 @@ +From: Alexandru Avadanii +Date: Tue, 11 Jul 2017 18:57:57 +0200 +Subject: [PATCH] salt.sh, user-data: Add Saltstack arm64 repo + +FIXME: Use https for fetching GPG repo key. + +Signed-off-by: Alexandru Avadanii +--- + mcp/scripts/salt.sh | 4 ++++ + mcp/scripts/user-data.template | 9 +++++++-- + 2 files changed, 11 insertions(+), 2 deletions(-) + +diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh +index 36ee27b..5732f4c 100755 +--- a/mcp/scripts/salt.sh ++++ b/mcp/scripts/salt.sh +@@ -48,6 +48,10 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s << SALT_INSTALL_END + cd ${OPNFV_FUEL_DIR}/mcp/patches && ./patch.sh patches.list reclass + + cd /srv/salt/scripts ++ if [ "\$(uname -i)" = "aarch64" ]; then ++ # NOTE(armband): On AArch64, skip creating apt source list definitions (-r) ++ export BOOTSTRAP_SALTSTACK_OPTS=" -r -dX stable 2016.3 " ++ fi + MASTER_HOSTNAME=cfg01.${CLUSTER_DOMAIN} DISTRIB_REVISION=nightly ./salt-master-init.sh + salt-key -Ay + +diff --git a/mcp/scripts/user-data.template b/mcp/scripts/user-data.template +index cc97a60..c696d35 100644 +--- a/mcp/scripts/user-data.template ++++ b/mcp/scripts/user-data.template +@@ -1,6 +1,11 @@ + #!/bin/bash +-wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11/SALTSTACK-GPG-KEY.pub | sudo apt-key add - +-echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11 xenial main" > /etc/apt/sources.list.d/salt.list ++if [ "$(uname -i)" = "aarch64" ]; then ++ wget -O - http://linux.enea.com/saltstack/apt/ubuntu/16.04/arm64/latest/SALTSTACK-GPG-KEY.pub | sudo apt-key add - ++ echo "deb http://linux.enea.com/saltstack/apt/ubuntu/16.04/arm64/latest xenial main" > /etc/apt/sources.list.d/salt.list ++else ++ wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11/SALTSTACK-GPG-KEY.pub | sudo apt-key add - ++ echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11 xenial main" > /etc/apt/sources.list.d/salt.list ++fi + apt update + apt-get install -y salt-minion + rm /etc/salt/minion_id diff --git a/patches/opnfv-fuel/0003-classes-virtual-AArch64-virtio-NIC-names-sync.patch b/patches/opnfv-fuel/0003-classes-virtual-AArch64-virtio-NIC-names-sync.patch new file mode 100644 index 00000000..812195b7 --- /dev/null +++ b/patches/opnfv-fuel/0003-classes-virtual-AArch64-virtio-NIC-names-sync.patch @@ -0,0 +1,425 @@ +From: Alexandru Avadanii +Date: Tue, 25 Jul 2017 02:53:16 +0200 +Subject: [PATCH] classes: virtual: AArch64: virtio NIC names sync + +grep -e "ens[[:digit:]]" -R . -l | \ + xargs sed -i \ + -e 's/ens3/enp1s0/g' \ + -e 's/ens4/enp2s0/g' \ + -e 's/ens5/enp3s0/g' \ + -e 's/ens6/enp4s0/g' + +Since AArch64 will be using virtio-net-pci NIC model for guests, +predictable interface naming yields a slightly different scheme. + +Update all configuration to reflect this. + +NOTE: Above configuration is expected with libvirt 3.x, which puts +each NIC on a separate PCIe bus (which also imposes virtio modern +is used). + +Signed-off-by: Alexandru Avadanii +--- + .../classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml | 2 +- + .../cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml | 2 +- + .../cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml | 8 ++++---- + .../cluster/virtual-mcp-ocata-odl-router/openstack/control.yml | 4 ++-- + .../cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml | 8 ++++---- + .../classes/cluster/virtual-mcp-ocata-odl/infra/config.yml | 2 +- + .../cluster/virtual-mcp-ocata-odl/opendaylight/control.yml | 2 +- + .../classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml | 8 ++++---- + .../classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml | 4 ++-- + .../classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml | 8 ++++---- + .../classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml | 6 +++--- + .../cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml | 8 ++++---- + .../cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml | 4 ++-- + .../cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml | 8 ++++---- + .../classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml | 2 +- + .../classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml | 8 ++++---- + .../classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml | 4 ++-- + .../classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml | 8 ++++---- + 18 files changed, 48 insertions(+), 48 deletions(-) + +diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml +index 63e58a2..2f8e94a 100644 +--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml ++++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml +@@ -27,7 +27,7 @@ parameters: + linux: + network: + interface: +- ens4: ++ enp2s0: + enabled: true + type: eth + proto: static +diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml +index 6e37978..e9e6056 100644 +--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml ++++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml +@@ -11,7 +11,7 @@ parameters: + linux: + network: + interface: +- ens4: ++ enp2s0: + enabled: true + type: eth + proto: static +diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml +index ba710a3..0c1a91f 100644 +--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml ++++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml +@@ -10,9 +10,9 @@ classes: + - cluster.virtual-mcp-ocata-odl-router + parameters: + _param: +- primary_interface: ens4 +- tenant_interface: ens5 +- external_interface: ens6 ++ primary_interface: enp2s0 ++ tenant_interface: enp3s0 ++ external_interface: enp4s0 + interface_mtu: 9000 + linux_system_codename: xenial + loopback_device_size: 10 +@@ -54,7 +54,7 @@ parameters: + interface: + dhcp_int: + enabled: true +- name: ens3 ++ name: enp1s0 + proto: dhcp + type: eth + mtu: ${_param:interface_mtu} +diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml +index 4d31b09..1ea653a 100644 +--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml ++++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml +@@ -40,13 +40,13 @@ parameters: + version: latest + network: + interface: +- ens4: ++ enp2s0: + enabled: true + type: eth + proto: static + address: ${_param:single_address} + netmask: 255.255.255.0 +- ens6: ++ enp4s0: + enabled: true + type: eth + proto: static +diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml +index fee8097..f6173d0 100644 +--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml ++++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml +@@ -6,9 +6,9 @@ classes: + - cluster.virtual-mcp-ocata-odl-router + parameters: + _param: +- primary_interface: ens4 +- tenant_interface: ens5 +- external_interface: ens6 ++ primary_interface: enp2s0 ++ tenant_interface: enp3s0 ++ external_interface: enp4s0 + interface_mtu: 9000 + linux_system_codename: xenial + neutron_agents: +@@ -33,7 +33,7 @@ parameters: + interface: + dhcp_int: + enabled: true +- name: ens3 ++ name: enp1s0 + proto: dhcp + type: eth + mtu: ${_param:interface_mtu} +diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml +index 328d6df..57c6cec 100644 +--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml ++++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml +@@ -27,7 +27,7 @@ parameters: + linux: + network: + interface: +- ens4: ++ enp2s0: + enabled: true + type: eth + proto: static +diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml +index 38431a5..066488b 100644 +--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml ++++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml +@@ -10,7 +10,7 @@ parameters: + linux: + network: + interface: +- ens4: ++ enp2s0: + enabled: true + type: eth + proto: static +diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml +index 97eda6c..3f18ccd 100644 +--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml ++++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml +@@ -10,9 +10,9 @@ classes: + - cluster.virtual-mcp-ocata-odl + parameters: + _param: +- primary_interface: ens4 +- tenant_interface: ens5 +- external_interface: ens6 ++ primary_interface: enp2s0 ++ tenant_interface: enp3s0 ++ external_interface: enp4s0 + interface_mtu: 9000 + linux_system_codename: xenial + loopback_device_size: 10 +@@ -52,7 +52,7 @@ parameters: + interface: + dhcp_int: + enabled: true +- name: ens3 ++ name: enp1s0 + proto: dhcp + type: eth + mtu: ${_param:interface_mtu} +diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml +index 17c22c5..ca3a812 100644 +--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml ++++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml +@@ -40,13 +40,13 @@ parameters: + version: latest + network: + interface: +- ens4: ++ enp2s0: + enabled: true + type: eth + proto: static + address: ${_param:single_address} + netmask: 255.255.255.0 +- ens6: ++ enp4s0: + enabled: true + type: eth + proto: static +diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml +index e8421ca..657ddd3 100644 +--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml ++++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml +@@ -6,9 +6,9 @@ classes: + - cluster.virtual-mcp-ocata-odl + parameters: + _param: +- primary_interface: ens4 +- tenant_interface: ens5 +- external_interface: ens6 ++ primary_interface: enp2s0 ++ tenant_interface: enp3s0 ++ external_interface: enp4s0 + interface_mtu: 9000 + linux_system_codename: xenial + neutron_agents: +@@ -32,7 +32,7 @@ parameters: + interface: + dhcp_int: + enabled: true +- name: ens3 ++ name: enp1s0 + proto: dhcp + type: eth + mtu: ${_param:interface_mtu} +diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml +index 864c71d..aec6cde 100644 +--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml ++++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml +@@ -26,7 +26,7 @@ parameters: + linux: + network: + interface: +- ens4: ++ enp2s0: + enabled: true + type: eth + proto: static +@@ -51,14 +51,14 @@ parameters: + single_address: 172.16.10.105 + tenant_address: 10.1.0.105 + external_address: 10.16.0.105 +- dpdk0_name: ens5 ++ dpdk0_name: enp3s0 + dpdk0_pci: '"0000:00:05.0"' + openstack_compute_node02: + params: + single_address: 172.16.10.106 + tenant_address: 10.1.0.106 + external_address: 10.16.0.106 +- dpdk0_name: ens5 ++ dpdk0_name: enp3s0 + dpdk0_pci: '"0000:00:05.0"' + openstack_gateway_node01: + params: +diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml +index c23ca7f..6d2f724 100644 +--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml ++++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml +@@ -12,9 +12,9 @@ classes: + - cluster.virtual-mcp-ocata-ovs-dpdk + parameters: + _param: +- primary_interface: ens4 +- tenant_interface: ens5 +- external_interface: ens6 ++ primary_interface: enp2s0 ++ tenant_interface: enp3s0 ++ external_interface: enp4s0 + interface_mtu: 9000 + linux_system_codename: xenial + loopback_device_size: 10 +@@ -51,7 +51,7 @@ parameters: + interface: + dhcp_int: + enabled: true +- name: ens3 ++ name: enp1s0 + proto: dhcp + type: eth + mtu: ${_param:interface_mtu} +diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml +index b85f085..20eb8f5 100644 +--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml ++++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml +@@ -40,13 +40,13 @@ parameters: + version: latest + network: + interface: +- ens4: ++ enp2s0: + enabled: true + type: eth + proto: static + address: ${_param:single_address} + netmask: 255.255.255.0 +- ens6: ++ enp4s0: + enabled: true + type: eth + proto: static +diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml +index e102c10..f153a19 100644 +--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml ++++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml +@@ -6,9 +6,9 @@ classes: + - cluster.virtual-mcp-ocata-ovs-dpdk + parameters: + _param: +- primary_interface: ens4 +- tenant_interface: ens5 +- external_interface: ens6 ++ primary_interface: enp2s0 ++ tenant_interface: enp3s0 ++ external_interface: enp4s0 + interface_mtu: 9000 + linux_system_codename: xenial + neutron: +@@ -22,7 +22,7 @@ parameters: + interface: + dhcp_int: + enabled: true +- name: ens3 ++ name: enp1s0 + proto: dhcp + type: eth + mtu: ${_param:interface_mtu} +diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml +index 97730b1..8cb0992 100644 +--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml ++++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml +@@ -26,7 +26,7 @@ parameters: + linux: + network: + interface: +- ens4: ++ enp2s0: + enabled: true + type: eth + proto: static +diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml +index a86a7c6..0469fa0 100644 +--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml ++++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml +@@ -10,9 +10,9 @@ classes: + - cluster.virtual-mcp-ocata-ovs + parameters: + _param: +- primary_interface: ens4 +- tenant_interface: ens5 +- external_interface: ens6 ++ primary_interface: enp2s0 ++ tenant_interface: enp3s0 ++ external_interface: enp4s0 + interface_mtu: 9000 + linux_system_codename: xenial + loopback_device_size: 10 +@@ -47,7 +47,7 @@ parameters: + interface: + dhcp_int: + enabled: true +- name: ens3 ++ name: enp1s0 + proto: dhcp + type: eth + mtu: ${_param:interface_mtu} +diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml +index ae103cd..350b618 100644 +--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml ++++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml +@@ -40,13 +40,13 @@ parameters: + version: latest + network: + interface: +- ens4: ++ enp2s0: + enabled: true + type: eth + proto: static + address: ${_param:single_address} + netmask: 255.255.255.0 +- ens6: ++ enp4s0: + enabled: true + type: eth + proto: static +diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml +index 9257d86..26b0e4c 100644 +--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml ++++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml +@@ -6,9 +6,9 @@ classes: + - cluster.virtual-mcp-ocata-ovs + parameters: + _param: +- primary_interface: ens4 +- tenant_interface: ens5 +- external_interface: ens6 ++ primary_interface: enp2s0 ++ tenant_interface: enp3s0 ++ external_interface: enp4s0 + interface_mtu: 9000 + linux_system_codename: xenial + neutron: +@@ -20,7 +20,7 @@ parameters: + interface: + dhcp_int: + enabled: true +- name: ens3 ++ name: enp1s0 + proto: dhcp + type: eth + mtu: ${_param:interface_mtu} diff --git a/patches/opnfv-fuel/0003-salt.sh-user-data-Add-Saltstack-arm64-repo.patch b/patches/opnfv-fuel/0003-salt.sh-user-data-Add-Saltstack-arm64-repo.patch deleted file mode 100644 index 4d27e4c0..00000000 --- a/patches/opnfv-fuel/0003-salt.sh-user-data-Add-Saltstack-arm64-repo.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: Alexandru Avadanii -Date: Tue, 11 Jul 2017 18:57:57 +0200 -Subject: [PATCH] salt.sh, user-data: Add Saltstack arm64 repo - -FIXME: Use https for fetching GPG repo key. - -Signed-off-by: Alexandru Avadanii ---- - mcp/scripts/salt.sh | 4 ++++ - mcp/scripts/user-data.template | 9 +++++++-- - 2 files changed, 11 insertions(+), 2 deletions(-) - -diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh -index 3d0fb91..589a0c4 100755 ---- a/mcp/scripts/salt.sh -+++ b/mcp/scripts/salt.sh -@@ -48,6 +48,10 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s << SALT_INSTALL_END - cd ${OPNFV_FUEL_DIR}/mcp/patches && ./patch.sh patches.list reclass - - cd /srv/salt/scripts -+ if [ "\$(uname -i)" = "aarch64" ]; then -+ # NOTE(armband): On AArch64, skip creating apt source list definitions (-r) -+ export BOOTSTRAP_SALTSTACK_OPTS=" -r -dX stable 2016.3 " -+ fi - MASTER_HOSTNAME=cfg01.${CLUSTER_DOMAIN} DISTRIB_REVISION=nightly ./salt-master-init.sh - salt-key -Ay - -diff --git a/mcp/scripts/user-data.template b/mcp/scripts/user-data.template -index cc97a60..c696d35 100644 ---- a/mcp/scripts/user-data.template -+++ b/mcp/scripts/user-data.template -@@ -1,6 +1,11 @@ - #!/bin/bash --wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11/SALTSTACK-GPG-KEY.pub | sudo apt-key add - --echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11 xenial main" > /etc/apt/sources.list.d/salt.list -+if [ "$(uname -i)" = "aarch64" ]; then -+ wget -O - http://linux.enea.com/saltstack/apt/ubuntu/16.04/arm64/latest/SALTSTACK-GPG-KEY.pub | sudo apt-key add - -+ echo "deb http://linux.enea.com/saltstack/apt/ubuntu/16.04/arm64/latest xenial main" > /etc/apt/sources.list.d/salt.list -+else -+ wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11/SALTSTACK-GPG-KEY.pub | sudo apt-key add - -+ echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11 xenial main" > /etc/apt/sources.list.d/salt.list -+fi - apt update - apt-get install -y salt-minion - rm /etc/salt/minion_id diff --git a/patches/opnfv-fuel/0004-classes-virtual-AArch64-virtio-NIC-names-sync.patch b/patches/opnfv-fuel/0004-classes-virtual-AArch64-virtio-NIC-names-sync.patch deleted file mode 100644 index 812195b7..00000000 --- a/patches/opnfv-fuel/0004-classes-virtual-AArch64-virtio-NIC-names-sync.patch +++ /dev/null @@ -1,425 +0,0 @@ -From: Alexandru Avadanii -Date: Tue, 25 Jul 2017 02:53:16 +0200 -Subject: [PATCH] classes: virtual: AArch64: virtio NIC names sync - -grep -e "ens[[:digit:]]" -R . -l | \ - xargs sed -i \ - -e 's/ens3/enp1s0/g' \ - -e 's/ens4/enp2s0/g' \ - -e 's/ens5/enp3s0/g' \ - -e 's/ens6/enp4s0/g' - -Since AArch64 will be using virtio-net-pci NIC model for guests, -predictable interface naming yields a slightly different scheme. - -Update all configuration to reflect this. - -NOTE: Above configuration is expected with libvirt 3.x, which puts -each NIC on a separate PCIe bus (which also imposes virtio modern -is used). - -Signed-off-by: Alexandru Avadanii ---- - .../classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml | 2 +- - .../cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml | 2 +- - .../cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml | 8 ++++---- - .../cluster/virtual-mcp-ocata-odl-router/openstack/control.yml | 4 ++-- - .../cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml | 8 ++++---- - .../classes/cluster/virtual-mcp-ocata-odl/infra/config.yml | 2 +- - .../cluster/virtual-mcp-ocata-odl/opendaylight/control.yml | 2 +- - .../classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml | 8 ++++---- - .../classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml | 4 ++-- - .../classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml | 8 ++++---- - .../classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml | 6 +++--- - .../cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml | 8 ++++---- - .../cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml | 4 ++-- - .../cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml | 8 ++++---- - .../classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml | 2 +- - .../classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml | 8 ++++---- - .../classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml | 4 ++-- - .../classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml | 8 ++++---- - 18 files changed, 48 insertions(+), 48 deletions(-) - -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml -index 63e58a2..2f8e94a 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml -@@ -27,7 +27,7 @@ parameters: - linux: - network: - interface: -- ens4: -+ enp2s0: - enabled: true - type: eth - proto: static -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml -index 6e37978..e9e6056 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml -@@ -11,7 +11,7 @@ parameters: - linux: - network: - interface: -- ens4: -+ enp2s0: - enabled: true - type: eth - proto: static -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml -index ba710a3..0c1a91f 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml -@@ -10,9 +10,9 @@ classes: - - cluster.virtual-mcp-ocata-odl-router - parameters: - _param: -- primary_interface: ens4 -- tenant_interface: ens5 -- external_interface: ens6 -+ primary_interface: enp2s0 -+ tenant_interface: enp3s0 -+ external_interface: enp4s0 - interface_mtu: 9000 - linux_system_codename: xenial - loopback_device_size: 10 -@@ -54,7 +54,7 @@ parameters: - interface: - dhcp_int: - enabled: true -- name: ens3 -+ name: enp1s0 - proto: dhcp - type: eth - mtu: ${_param:interface_mtu} -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml -index 4d31b09..1ea653a 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml -@@ -40,13 +40,13 @@ parameters: - version: latest - network: - interface: -- ens4: -+ enp2s0: - enabled: true - type: eth - proto: static - address: ${_param:single_address} - netmask: 255.255.255.0 -- ens6: -+ enp4s0: - enabled: true - type: eth - proto: static -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml -index fee8097..f6173d0 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml -@@ -6,9 +6,9 @@ classes: - - cluster.virtual-mcp-ocata-odl-router - parameters: - _param: -- primary_interface: ens4 -- tenant_interface: ens5 -- external_interface: ens6 -+ primary_interface: enp2s0 -+ tenant_interface: enp3s0 -+ external_interface: enp4s0 - interface_mtu: 9000 - linux_system_codename: xenial - neutron_agents: -@@ -33,7 +33,7 @@ parameters: - interface: - dhcp_int: - enabled: true -- name: ens3 -+ name: enp1s0 - proto: dhcp - type: eth - mtu: ${_param:interface_mtu} -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml -index 328d6df..57c6cec 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml -@@ -27,7 +27,7 @@ parameters: - linux: - network: - interface: -- ens4: -+ enp2s0: - enabled: true - type: eth - proto: static -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml -index 38431a5..066488b 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml -@@ -10,7 +10,7 @@ parameters: - linux: - network: - interface: -- ens4: -+ enp2s0: - enabled: true - type: eth - proto: static -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml -index 97eda6c..3f18ccd 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml -@@ -10,9 +10,9 @@ classes: - - cluster.virtual-mcp-ocata-odl - parameters: - _param: -- primary_interface: ens4 -- tenant_interface: ens5 -- external_interface: ens6 -+ primary_interface: enp2s0 -+ tenant_interface: enp3s0 -+ external_interface: enp4s0 - interface_mtu: 9000 - linux_system_codename: xenial - loopback_device_size: 10 -@@ -52,7 +52,7 @@ parameters: - interface: - dhcp_int: - enabled: true -- name: ens3 -+ name: enp1s0 - proto: dhcp - type: eth - mtu: ${_param:interface_mtu} -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml -index 17c22c5..ca3a812 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml -@@ -40,13 +40,13 @@ parameters: - version: latest - network: - interface: -- ens4: -+ enp2s0: - enabled: true - type: eth - proto: static - address: ${_param:single_address} - netmask: 255.255.255.0 -- ens6: -+ enp4s0: - enabled: true - type: eth - proto: static -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml -index e8421ca..657ddd3 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/gateway.yml -@@ -6,9 +6,9 @@ classes: - - cluster.virtual-mcp-ocata-odl - parameters: - _param: -- primary_interface: ens4 -- tenant_interface: ens5 -- external_interface: ens6 -+ primary_interface: enp2s0 -+ tenant_interface: enp3s0 -+ external_interface: enp4s0 - interface_mtu: 9000 - linux_system_codename: xenial - neutron_agents: -@@ -32,7 +32,7 @@ parameters: - interface: - dhcp_int: - enabled: true -- name: ens3 -+ name: enp1s0 - proto: dhcp - type: eth - mtu: ${_param:interface_mtu} -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml -index 864c71d..aec6cde 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml -@@ -26,7 +26,7 @@ parameters: - linux: - network: - interface: -- ens4: -+ enp2s0: - enabled: true - type: eth - proto: static -@@ -51,14 +51,14 @@ parameters: - single_address: 172.16.10.105 - tenant_address: 10.1.0.105 - external_address: 10.16.0.105 -- dpdk0_name: ens5 -+ dpdk0_name: enp3s0 - dpdk0_pci: '"0000:00:05.0"' - openstack_compute_node02: - params: - single_address: 172.16.10.106 - tenant_address: 10.1.0.106 - external_address: 10.16.0.106 -- dpdk0_name: ens5 -+ dpdk0_name: enp3s0 - dpdk0_pci: '"0000:00:05.0"' - openstack_gateway_node01: - params: -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml -index c23ca7f..6d2f724 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml -@@ -12,9 +12,9 @@ classes: - - cluster.virtual-mcp-ocata-ovs-dpdk - parameters: - _param: -- primary_interface: ens4 -- tenant_interface: ens5 -- external_interface: ens6 -+ primary_interface: enp2s0 -+ tenant_interface: enp3s0 -+ external_interface: enp4s0 - interface_mtu: 9000 - linux_system_codename: xenial - loopback_device_size: 10 -@@ -51,7 +51,7 @@ parameters: - interface: - dhcp_int: - enabled: true -- name: ens3 -+ name: enp1s0 - proto: dhcp - type: eth - mtu: ${_param:interface_mtu} -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml -index b85f085..20eb8f5 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml -@@ -40,13 +40,13 @@ parameters: - version: latest - network: - interface: -- ens4: -+ enp2s0: - enabled: true - type: eth - proto: static - address: ${_param:single_address} - netmask: 255.255.255.0 -- ens6: -+ enp4s0: - enabled: true - type: eth - proto: static -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml -index e102c10..f153a19 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml -@@ -6,9 +6,9 @@ classes: - - cluster.virtual-mcp-ocata-ovs-dpdk - parameters: - _param: -- primary_interface: ens4 -- tenant_interface: ens5 -- external_interface: ens6 -+ primary_interface: enp2s0 -+ tenant_interface: enp3s0 -+ external_interface: enp4s0 - interface_mtu: 9000 - linux_system_codename: xenial - neutron: -@@ -22,7 +22,7 @@ parameters: - interface: - dhcp_int: - enabled: true -- name: ens3 -+ name: enp1s0 - proto: dhcp - type: eth - mtu: ${_param:interface_mtu} -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml -index 97730b1..8cb0992 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml -@@ -26,7 +26,7 @@ parameters: - linux: - network: - interface: -- ens4: -+ enp2s0: - enabled: true - type: eth - proto: static -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml -index a86a7c6..0469fa0 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml -@@ -10,9 +10,9 @@ classes: - - cluster.virtual-mcp-ocata-ovs - parameters: - _param: -- primary_interface: ens4 -- tenant_interface: ens5 -- external_interface: ens6 -+ primary_interface: enp2s0 -+ tenant_interface: enp3s0 -+ external_interface: enp4s0 - interface_mtu: 9000 - linux_system_codename: xenial - loopback_device_size: 10 -@@ -47,7 +47,7 @@ parameters: - interface: - dhcp_int: - enabled: true -- name: ens3 -+ name: enp1s0 - proto: dhcp - type: eth - mtu: ${_param:interface_mtu} -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml -index ae103cd..350b618 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml -@@ -40,13 +40,13 @@ parameters: - version: latest - network: - interface: -- ens4: -+ enp2s0: - enabled: true - type: eth - proto: static - address: ${_param:single_address} - netmask: 255.255.255.0 -- ens6: -+ enp4s0: - enabled: true - type: eth - proto: static -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml -index 9257d86..26b0e4c 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml -@@ -6,9 +6,9 @@ classes: - - cluster.virtual-mcp-ocata-ovs - parameters: - _param: -- primary_interface: ens4 -- tenant_interface: ens5 -- external_interface: ens6 -+ primary_interface: enp2s0 -+ tenant_interface: enp3s0 -+ external_interface: enp4s0 - interface_mtu: 9000 - linux_system_codename: xenial - neutron: -@@ -20,7 +20,7 @@ parameters: - interface: - dhcp_int: - enabled: true -- name: ens3 -+ name: enp1s0 - proto: dhcp - type: eth - mtu: ${_param:interface_mtu} diff --git a/patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch new file mode 100644 index 00000000..0b77805b --- /dev/null +++ b/patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch @@ -0,0 +1,178 @@ +From: Guillermo Herrero +Date: Tue, 25 Jul 2017 00:58:32 +0200 +Subject: [PATCH] mcp: salt-formulas: Add & enable armband formula + +FIXME: Re-enable apparmor. +FIXME: Detect baremetal and re-enable acceleration. + +- install qemu-efi; +- install vgabios; +- disable apparmor as security driver for libvirt (temporary); +- fix missing link for vgabios binary blob; +- nova: virt_type=qemu (temporary, until we support baremetal too); +- nova: pointer_model=ps2mouse since AArch64 has no USB tablet; +- nova: cpu_model=cortex-a57; +- nova: libvirt driver: Add ttyAMA0 by default on AArch64; +- nova: libvirt driver: Use VGA video type by default on AArch64; + +Signed-off-by: Guillermo Herrero +Signed-off-by: Charalampos Kominos +Signed-off-by: Alexandru Avadanii +--- + mcp/config/states/openstack | 2 + + .../armband/files/nova-libvirt-driver.diff | 48 ++++++++++++++++++++++ + mcp/salt-formulas/armband/init.sls | 6 +++ + mcp/salt-formulas/armband/libvirt_driver.sls | 5 +++ + mcp/salt-formulas/armband/nova.sls | 24 +++++++++++ + mcp/salt-formulas/armband/qemu.sls | 7 ++++ + mcp/salt-formulas/armband/vgabios.sls | 6 +++ + 7 files changed, 98 insertions(+) + create mode 100644 mcp/salt-formulas/armband/files/nova-libvirt-driver.diff + create mode 100644 mcp/salt-formulas/armband/init.sls + create mode 100644 mcp/salt-formulas/armband/libvirt_driver.sls + create mode 100644 mcp/salt-formulas/armband/nova.sls + create mode 100644 mcp/salt-formulas/armband/qemu.sls + create mode 100644 mcp/salt-formulas/armband/vgabios.sls + +diff --git a/mcp/config/states/openstack b/mcp/config/states/openstack +index 57ca585..23aaf72 100755 +--- a/mcp/config/states/openstack ++++ b/mcp/config/states/openstack +@@ -23,3 +23,5 @@ salt -I 'neutron:gateway' state.sls neutron + salt -I 'nova:compute' state.sls nova + + salt -I 'horizon:server' state.sls horizon ++ ++salt -I 'nova:compute' state.sls armband +diff --git a/mcp/salt-formulas/armband/files/nova-libvirt-driver.diff b/mcp/salt-formulas/armband/files/nova-libvirt-driver.diff +new file mode 100644 +index 0000000..a5b08da +--- /dev/null ++++ b/mcp/salt-formulas/armband/files/nova-libvirt-driver.diff +@@ -0,0 +1,48 @@ ++From: Stanislaw Kardach ++Date: Tue, 22 Mar 2016 12:05:09 +0100 ++Subject: [PATCH] nova: Update vga, console defaults for armv7, aarch64 ++ ++Nova hardcodes default options for both video=cirrus and console. ++armv7 and aarch64 VMs require video=vga, and since most applications ++use PL011 serial driver for guests, adding console=ttyAMA0 is also ++a nice UX addition. ++ ++Signed-off-by: Stanislaw Kardach ++Signed-off-by: Alexandru Avadanii ++Signed-off-by: Guillermo Herrero ++ ++--- ++ usr/lib/python2.7/dist-packages/nova/virt/libvirt/driver.py | 10 +++++++++- ++ 1 file changed, 9 insertions(+), 1 deletion(-) ++ ++diff --git a/usr/lib/python2.7/dist-packages/nova/virt/libvirt/driver.py b/usr/lib/python2.7/dist-packages/nova/virt/libvirt/driver.py ++index bba9b00..99e86be 100644 ++--- a/usr/lib/python2.7/dist-packages/nova/virt/libvirt/driver.py +++++ b/usr/lib/python2.7/dist-packages/nova/virt/libvirt/driver.py ++@@ -4179,7 +4179,12 @@ class LibvirtDriver(driver.ComputeDriver): ++ if virt_type == "xen": ++ guest.os_cmdline = "ro root=%s" % root_device_name ++ else: +++ guestarch = libvirt_utils.get_arch(image_meta) ++ guest.os_cmdline = ("root=%s %s" % (root_device_name, CONSOLE)) +++ if guestarch in (fields.Architecture.ARMV7, +++ fields.Architecture.AARCH64): +++ # NOTE(armband): ARM v7/v8 use PL011 drv, add ttyAMA0 console +++ guest.os_cmdline += " console=ttyAMA0" ++ if virt_type == "qemu": ++ guest.os_cmdline += " no_timer_check" ++ if instance.ramdisk_id: ++@@ -4288,9 +4293,12 @@ class LibvirtDriver(driver.ComputeDriver): ++ video.type = 'xen' ++ elif CONF.libvirt.virt_type == 'parallels': ++ video.type = 'vga' ++- elif guestarch in (fields.Architecture.PPC, +++ elif guestarch in (fields.Architecture.ARMV7, +++ fields.Architecture.AARCH64, +++ fields.Architecture.PPC, ++ fields.Architecture.PPC64, ++ fields.Architecture.PPC64LE): +++ # NOTE(armband): Added ARM v7/v8, same as on PPC. ++ # NOTE(ldbragst): PowerKVM doesn't support 'cirrus' be default ++ # so use 'vga' instead when running on Power hardware. ++ video.type = 'vga' +diff --git a/mcp/salt-formulas/armband/init.sls b/mcp/salt-formulas/armband/init.sls +new file mode 100644 +index 0000000..6e7b6ad +--- /dev/null ++++ b/mcp/salt-formulas/armband/init.sls +@@ -0,0 +1,6 @@ ++include: ++ - armband.qemu ++ - armband.vgabios ++ - armband.nova ++ - armband.libvirt_driver ++ +diff --git a/mcp/salt-formulas/armband/libvirt_driver.sls b/mcp/salt-formulas/armband/libvirt_driver.sls +new file mode 100644 +index 0000000..c309035 +--- /dev/null ++++ b/mcp/salt-formulas/armband/libvirt_driver.sls +@@ -0,0 +1,5 @@ ++/usr/lib/python2.7/dist-packages/nova/virt/libvirt/driver.py: ++ file.patch: ++ - source: salt://armband/files/nova-libvirt-driver.diff ++ - hash: "668641080c6a77a9205d0f71d510ad5f" ++ +diff --git a/mcp/salt-formulas/armband/nova.sls b/mcp/salt-formulas/armband/nova.sls +new file mode 100644 +index 0000000..994d505 +--- /dev/null ++++ b/mcp/salt-formulas/armband/nova.sls +@@ -0,0 +1,24 @@ ++nova_virt_type: ++ file.replace: ++ - name: "/etc/nova/nova.conf" ++ - pattern: ^virt_type =.*$ ++ - repl: "virt_type = qemu" ++nova_pointer_model: ++ file.replace: ++ - name: "/etc/nova/nova.conf" ++ - pattern: ^#pointer_model=.*$ ++ - repl: "pointer_model=ps2mouse" ++nova_cpu_mode: ++ file.replace: ++ - name: "/etc/nova/nova.conf" ++ - pattern: "^cpu_mode = host-passthrough" ++ - repl: "cpu_mode=custom" ++nova_cpu_model: ++ file.replace: ++ - name: "/etc/nova/nova.conf" ++ - pattern: ^#cpu_model=.*$ ++ - repl: "cpu_model=cortex-a57" ++restart_nova-compute: ++ cmd: ++ - run ++ - name: "service nova-compute restart" +diff --git a/mcp/salt-formulas/armband/qemu.sls b/mcp/salt-formulas/armband/qemu.sls +new file mode 100644 +index 0000000..ecdb5ae +--- /dev/null ++++ b/mcp/salt-formulas/armband/qemu.sls +@@ -0,0 +1,7 @@ ++qemu-efi: ++ pkg.installed ++/etc/libvirt/qemu.conf: ++ file.replace: ++ - pattern: ^#security_driver =.*$ ++ - repl: "security_driver = \"none\"" ++ +diff --git a/mcp/salt-formulas/armband/vgabios.sls b/mcp/salt-formulas/armband/vgabios.sls +new file mode 100644 +index 0000000..a31eafa +--- /dev/null ++++ b/mcp/salt-formulas/armband/vgabios.sls +@@ -0,0 +1,6 @@ ++vgabios: ++ pkg.installed ++/usr/share/qemu/vgabios-stdvga.bin: ++ file.symlink: ++ - target: "/usr/share/vgabios/vgabios.bin" ++ diff --git a/patches/opnfv-fuel/0005-mcp-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0005-mcp-salt-formulas-Add-enable-armband-formula.patch deleted file mode 100644 index 0b77805b..00000000 --- a/patches/opnfv-fuel/0005-mcp-salt-formulas-Add-enable-armband-formula.patch +++ /dev/null @@ -1,178 +0,0 @@ -From: Guillermo Herrero -Date: Tue, 25 Jul 2017 00:58:32 +0200 -Subject: [PATCH] mcp: salt-formulas: Add & enable armband formula - -FIXME: Re-enable apparmor. -FIXME: Detect baremetal and re-enable acceleration. - -- install qemu-efi; -- install vgabios; -- disable apparmor as security driver for libvirt (temporary); -- fix missing link for vgabios binary blob; -- nova: virt_type=qemu (temporary, until we support baremetal too); -- nova: pointer_model=ps2mouse since AArch64 has no USB tablet; -- nova: cpu_model=cortex-a57; -- nova: libvirt driver: Add ttyAMA0 by default on AArch64; -- nova: libvirt driver: Use VGA video type by default on AArch64; - -Signed-off-by: Guillermo Herrero -Signed-off-by: Charalampos Kominos -Signed-off-by: Alexandru Avadanii ---- - mcp/config/states/openstack | 2 + - .../armband/files/nova-libvirt-driver.diff | 48 ++++++++++++++++++++++ - mcp/salt-formulas/armband/init.sls | 6 +++ - mcp/salt-formulas/armband/libvirt_driver.sls | 5 +++ - mcp/salt-formulas/armband/nova.sls | 24 +++++++++++ - mcp/salt-formulas/armband/qemu.sls | 7 ++++ - mcp/salt-formulas/armband/vgabios.sls | 6 +++ - 7 files changed, 98 insertions(+) - create mode 100644 mcp/salt-formulas/armband/files/nova-libvirt-driver.diff - create mode 100644 mcp/salt-formulas/armband/init.sls - create mode 100644 mcp/salt-formulas/armband/libvirt_driver.sls - create mode 100644 mcp/salt-formulas/armband/nova.sls - create mode 100644 mcp/salt-formulas/armband/qemu.sls - create mode 100644 mcp/salt-formulas/armband/vgabios.sls - -diff --git a/mcp/config/states/openstack b/mcp/config/states/openstack -index 57ca585..23aaf72 100755 ---- a/mcp/config/states/openstack -+++ b/mcp/config/states/openstack -@@ -23,3 +23,5 @@ salt -I 'neutron:gateway' state.sls neutron - salt -I 'nova:compute' state.sls nova - - salt -I 'horizon:server' state.sls horizon -+ -+salt -I 'nova:compute' state.sls armband -diff --git a/mcp/salt-formulas/armband/files/nova-libvirt-driver.diff b/mcp/salt-formulas/armband/files/nova-libvirt-driver.diff -new file mode 100644 -index 0000000..a5b08da ---- /dev/null -+++ b/mcp/salt-formulas/armband/files/nova-libvirt-driver.diff -@@ -0,0 +1,48 @@ -+From: Stanislaw Kardach -+Date: Tue, 22 Mar 2016 12:05:09 +0100 -+Subject: [PATCH] nova: Update vga, console defaults for armv7, aarch64 -+ -+Nova hardcodes default options for both video=cirrus and console. -+armv7 and aarch64 VMs require video=vga, and since most applications -+use PL011 serial driver for guests, adding console=ttyAMA0 is also -+a nice UX addition. -+ -+Signed-off-by: Stanislaw Kardach -+Signed-off-by: Alexandru Avadanii -+Signed-off-by: Guillermo Herrero -+ -+--- -+ usr/lib/python2.7/dist-packages/nova/virt/libvirt/driver.py | 10 +++++++++- -+ 1 file changed, 9 insertions(+), 1 deletion(-) -+ -+diff --git a/usr/lib/python2.7/dist-packages/nova/virt/libvirt/driver.py b/usr/lib/python2.7/dist-packages/nova/virt/libvirt/driver.py -+index bba9b00..99e86be 100644 -+--- a/usr/lib/python2.7/dist-packages/nova/virt/libvirt/driver.py -++++ b/usr/lib/python2.7/dist-packages/nova/virt/libvirt/driver.py -+@@ -4179,7 +4179,12 @@ class LibvirtDriver(driver.ComputeDriver): -+ if virt_type == "xen": -+ guest.os_cmdline = "ro root=%s" % root_device_name -+ else: -++ guestarch = libvirt_utils.get_arch(image_meta) -+ guest.os_cmdline = ("root=%s %s" % (root_device_name, CONSOLE)) -++ if guestarch in (fields.Architecture.ARMV7, -++ fields.Architecture.AARCH64): -++ # NOTE(armband): ARM v7/v8 use PL011 drv, add ttyAMA0 console -++ guest.os_cmdline += " console=ttyAMA0" -+ if virt_type == "qemu": -+ guest.os_cmdline += " no_timer_check" -+ if instance.ramdisk_id: -+@@ -4288,9 +4293,12 @@ class LibvirtDriver(driver.ComputeDriver): -+ video.type = 'xen' -+ elif CONF.libvirt.virt_type == 'parallels': -+ video.type = 'vga' -+- elif guestarch in (fields.Architecture.PPC, -++ elif guestarch in (fields.Architecture.ARMV7, -++ fields.Architecture.AARCH64, -++ fields.Architecture.PPC, -+ fields.Architecture.PPC64, -+ fields.Architecture.PPC64LE): -++ # NOTE(armband): Added ARM v7/v8, same as on PPC. -+ # NOTE(ldbragst): PowerKVM doesn't support 'cirrus' be default -+ # so use 'vga' instead when running on Power hardware. -+ video.type = 'vga' -diff --git a/mcp/salt-formulas/armband/init.sls b/mcp/salt-formulas/armband/init.sls -new file mode 100644 -index 0000000..6e7b6ad ---- /dev/null -+++ b/mcp/salt-formulas/armband/init.sls -@@ -0,0 +1,6 @@ -+include: -+ - armband.qemu -+ - armband.vgabios -+ - armband.nova -+ - armband.libvirt_driver -+ -diff --git a/mcp/salt-formulas/armband/libvirt_driver.sls b/mcp/salt-formulas/armband/libvirt_driver.sls -new file mode 100644 -index 0000000..c309035 ---- /dev/null -+++ b/mcp/salt-formulas/armband/libvirt_driver.sls -@@ -0,0 +1,5 @@ -+/usr/lib/python2.7/dist-packages/nova/virt/libvirt/driver.py: -+ file.patch: -+ - source: salt://armband/files/nova-libvirt-driver.diff -+ - hash: "668641080c6a77a9205d0f71d510ad5f" -+ -diff --git a/mcp/salt-formulas/armband/nova.sls b/mcp/salt-formulas/armband/nova.sls -new file mode 100644 -index 0000000..994d505 ---- /dev/null -+++ b/mcp/salt-formulas/armband/nova.sls -@@ -0,0 +1,24 @@ -+nova_virt_type: -+ file.replace: -+ - name: "/etc/nova/nova.conf" -+ - pattern: ^virt_type =.*$ -+ - repl: "virt_type = qemu" -+nova_pointer_model: -+ file.replace: -+ - name: "/etc/nova/nova.conf" -+ - pattern: ^#pointer_model=.*$ -+ - repl: "pointer_model=ps2mouse" -+nova_cpu_mode: -+ file.replace: -+ - name: "/etc/nova/nova.conf" -+ - pattern: "^cpu_mode = host-passthrough" -+ - repl: "cpu_mode=custom" -+nova_cpu_model: -+ file.replace: -+ - name: "/etc/nova/nova.conf" -+ - pattern: ^#cpu_model=.*$ -+ - repl: "cpu_model=cortex-a57" -+restart_nova-compute: -+ cmd: -+ - run -+ - name: "service nova-compute restart" -diff --git a/mcp/salt-formulas/armband/qemu.sls b/mcp/salt-formulas/armband/qemu.sls -new file mode 100644 -index 0000000..ecdb5ae ---- /dev/null -+++ b/mcp/salt-formulas/armband/qemu.sls -@@ -0,0 +1,7 @@ -+qemu-efi: -+ pkg.installed -+/etc/libvirt/qemu.conf: -+ file.replace: -+ - pattern: ^#security_driver =.*$ -+ - repl: "security_driver = \"none\"" -+ -diff --git a/mcp/salt-formulas/armband/vgabios.sls b/mcp/salt-formulas/armband/vgabios.sls -new file mode 100644 -index 0000000..a31eafa ---- /dev/null -+++ b/mcp/salt-formulas/armband/vgabios.sls -@@ -0,0 +1,6 @@ -+vgabios: -+ pkg.installed -+/usr/share/qemu/vgabios-stdvga.bin: -+ file.symlink: -+ - target: "/usr/share/vgabios/vgabios.bin" -+ diff --git a/patches/opnfv-fuel/0005-network-public-Use-arm-virtual2-POD-config.patch b/patches/opnfv-fuel/0005-network-public-Use-arm-virtual2-POD-config.patch new file mode 100644 index 00000000..256a44dc --- /dev/null +++ b/patches/opnfv-fuel/0005-network-public-Use-arm-virtual2-POD-config.patch @@ -0,0 +1,167 @@ +From: Alexandru Avadanii +Date: Tue, 18 Jul 2017 19:17:24 +0200 +Subject: [PATCH] network: public: Use arm-virtual2 POD config + +grep -e "10\.16\.0\." -R . -l | \ + xargs sed -i \ + -e 's/10\.16\.0\./10.0.9./g' \ + -e 's/10\.0\.9\.254/10.0.9.200/g' + -e 's/10\.0\.9\.1/10.0.9.254/g' + +NOTE: This should be converted into a dynamic configuration read from +the universal POD descriptor in securedlab, once that is ready. + +Until then, just align the public network configuration used by the +virtual POD with the Enea lab configuration specific to arm-virtual2 +(i.e. public network on 10.0.9.0/24). + +NOTE: Replace the gateway at 10.16.0.1 (now 10.0.9.1) with the same +IP address as our lab's gateway (10.0.9.254), to keep both possible +network layouts in sync (using all virtual networks created via +virsh, respectively our lab's static config). +This will ensure deploys continue to work in both enviroments. + +Also, since our new gateway resides at 10.0.9.254, trim the DHCP pool +range for the public network to not include that address. + +Signed-off-by: Alexandru Avadanii +--- + mcp/config/states/networks | 2 +- + mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml | 6 +++--- + .../classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml | 2 +- + .../classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml | 6 +++--- + .../classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml | 2 +- + mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml | 6 +++--- + .../classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml | 2 +- + mcp/scripts/net_public.xml | 2 +- + 8 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/mcp/config/states/networks b/mcp/config/states/networks +index 205e0a9..df4c0bb 100755 +--- a/mcp/config/states/networks ++++ b/mcp/config/states/networks +@@ -1,3 +1,3 @@ + salt 'ctl01*' cmd.run ". /root/keystonercv3; openstack compute service list; openstack network agent list; openstack stack list; openstack volume service list" + salt 'ctl01*' cmd.run ". /root/keystonercv3; openstack network create --external --default --provider-network-type flat --provider-physical-network physnet1 floating_net" +-salt 'ctl01*' cmd.run ". /root/keystonercv3; openstack subnet create --gateway 10.16.0.1 --no-dhcp --allocation-pool start=10.16.0.130,end=10.16.0.254 --network floating_net --subnet-range 10.16.0.0/24 floating_subnet" ++salt 'ctl01*' cmd.run ". /root/keystonercv3; openstack subnet create --gateway 10.0.9.254 --no-dhcp --allocation-pool start=10.0.9.130,end=10.0.9.200 --network floating_net --subnet-range 10.0.9.0/24 floating_subnet" +diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml +index 57c6cec..f519e22 100644 +--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml ++++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml +@@ -51,16 +51,16 @@ parameters: + params: + single_address: 172.16.10.105 + tenant_address: 10.1.0.105 +- external_address: 10.16.0.105 ++ external_address: 10.0.9.105 + openstack_compute_node02: + params: + single_address: 172.16.10.106 + tenant_address: 10.1.0.106 +- external_address: 10.16.0.106 ++ external_address: 10.0.9.106 + openstack_gateway_node01: + params: + tenant_address: 10.1.0.110 +- external_address: 10.16.0.110 ++ external_address: 10.0.9.110 + opendaylight_control_node01: + classes: + - cluster.${_param:cluster_name}.opendaylight.control +diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml +index 66e5a97..98625ff 100644 +--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml ++++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml +@@ -6,7 +6,7 @@ parameters: + openstack_region: RegionOne + admin_email: root@localhost + cluster_public_protocol: http +- cluster_public_host: 10.16.0.101 ++ cluster_public_host: 10.0.9.101 + neutron_public_protocol: http + neutron_control_dvr: False + neutron_tenant_network_types: "flat,vxlan" +diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml +index aec6cde..b69258f 100644 +--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml ++++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml +@@ -50,17 +50,17 @@ parameters: + params: + single_address: 172.16.10.105 + tenant_address: 10.1.0.105 +- external_address: 10.16.0.105 ++ external_address: 10.0.9.105 + dpdk0_name: enp3s0 + dpdk0_pci: '"0000:00:05.0"' + openstack_compute_node02: + params: + single_address: 172.16.10.106 + tenant_address: 10.1.0.106 +- external_address: 10.16.0.106 ++ external_address: 10.0.9.106 + dpdk0_name: enp3s0 + dpdk0_pci: '"0000:00:05.0"' + openstack_gateway_node01: + params: + tenant_address: 10.1.0.110 +- external_address: 10.16.0.110 ++ external_address: 10.0.9.110 +diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml +index dfc0b51..b106e86 100644 +--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml ++++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml +@@ -6,7 +6,7 @@ parameters: + openstack_region: RegionOne + admin_email: root@localhost + cluster_public_protocol: http +- cluster_public_host: 10.16.0.101 ++ cluster_public_host: 10.0.9.101 + neutron_public_protocol: http + neutron_control_dvr: False + neutron_tenant_network_types: "flat,vlan" +diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml +index 8cb0992..c8f8477 100644 +--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml ++++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml +@@ -50,13 +50,13 @@ parameters: + params: + single_address: 172.16.10.105 + tenant_address: 10.1.0.105 +- external_address: 10.16.0.105 ++ external_address: 10.0.9.105 + openstack_compute_node02: + params: + single_address: 172.16.10.106 + tenant_address: 10.1.0.106 +- external_address: 10.16.0.106 ++ external_address: 10.0.9.106 + openstack_gateway_node01: + params: + tenant_address: 10.1.0.110 +- external_address: 10.16.0.110 ++ external_address: 10.0.9.110 +diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml +index 7079fd1..fccde1f 100644 +--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml ++++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml +@@ -6,7 +6,7 @@ parameters: + openstack_region: RegionOne + admin_email: root@localhost + cluster_public_protocol: http +- cluster_public_host: 10.16.0.101 ++ cluster_public_host: 10.0.9.101 + neutron_public_protocol: http + neutron_control_dvr: False + neutron_tenant_network_types: "flat,vxlan" +diff --git a/mcp/scripts/net_public.xml b/mcp/scripts/net_public.xml +index 61650d5..f455480 100644 +--- a/mcp/scripts/net_public.xml ++++ b/mcp/scripts/net_public.xml +@@ -2,5 +2,5 @@ + public + + +- ++ + diff --git a/patches/opnfv-fuel/0006-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch b/patches/opnfv-fuel/0006-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch new file mode 100644 index 00000000..267407cb --- /dev/null +++ b/patches/opnfv-fuel/0006-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch @@ -0,0 +1,40 @@ +From: Alexandru Avadanii +Date: Thu, 27 Jul 2017 23:42:29 +0200 +Subject: [PATCH] mcp: salt-formulas: opendaylight: AArch64 leveldb + +ODL requires native leveldbjni support on architectures like AArch64. +Armband provides a Debian package that provides exactly that, +specially tailored to be applied on top of upstream Opendaylight +Debian package. + +Install as part of the existing Opendaylight +salt-formula (and not as part of Armband's separate salt-formula, like +previous fixups). + +Some dependencies are not self-contained in this formula yet, and +should be handled before upstreaming this patch: +- Armband DEB repository (mcp-repos) is added by "openstack" state; +- only Debian systems are supported (no equivalent RPM provided); +- only systemd is supported (unlikely to change); + +JIRA: https://jira.opnfv.org/browse/ARMBAND-283 + +Signed-off-by: Alexandru Avadanii +--- + mcp/salt-formulas/opendaylight/server.sls | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/mcp/salt-formulas/opendaylight/server.sls b/mcp/salt-formulas/opendaylight/server.sls +index 8c6c3b2..a2236ae 100644 +--- a/mcp/salt-formulas/opendaylight/server.sls ++++ b/mcp/salt-formulas/opendaylight/server.sls +@@ -58,4 +58,9 @@ opendaylight: + - service: opendaylight + {%- endif %} + ++opendaylight_aarch64_leveldbjni: ++ pkg.installed: ++ {% if grains['cpuarch'] == 'aarch64'%} ++ - name: armband-odl-leveldb-fix ++ {% endif %} + {%- endif %} diff --git a/patches/opnfv-fuel/0006-network-public-Use-arm-virtual2-POD-config.patch b/patches/opnfv-fuel/0006-network-public-Use-arm-virtual2-POD-config.patch deleted file mode 100644 index 256a44dc..00000000 --- a/patches/opnfv-fuel/0006-network-public-Use-arm-virtual2-POD-config.patch +++ /dev/null @@ -1,167 +0,0 @@ -From: Alexandru Avadanii -Date: Tue, 18 Jul 2017 19:17:24 +0200 -Subject: [PATCH] network: public: Use arm-virtual2 POD config - -grep -e "10\.16\.0\." -R . -l | \ - xargs sed -i \ - -e 's/10\.16\.0\./10.0.9./g' \ - -e 's/10\.0\.9\.254/10.0.9.200/g' - -e 's/10\.0\.9\.1/10.0.9.254/g' - -NOTE: This should be converted into a dynamic configuration read from -the universal POD descriptor in securedlab, once that is ready. - -Until then, just align the public network configuration used by the -virtual POD with the Enea lab configuration specific to arm-virtual2 -(i.e. public network on 10.0.9.0/24). - -NOTE: Replace the gateway at 10.16.0.1 (now 10.0.9.1) with the same -IP address as our lab's gateway (10.0.9.254), to keep both possible -network layouts in sync (using all virtual networks created via -virsh, respectively our lab's static config). -This will ensure deploys continue to work in both enviroments. - -Also, since our new gateway resides at 10.0.9.254, trim the DHCP pool -range for the public network to not include that address. - -Signed-off-by: Alexandru Avadanii ---- - mcp/config/states/networks | 2 +- - mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml | 6 +++--- - .../classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml | 2 +- - .../classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml | 6 +++--- - .../classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml | 2 +- - mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml | 6 +++--- - .../classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml | 2 +- - mcp/scripts/net_public.xml | 2 +- - 8 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/mcp/config/states/networks b/mcp/config/states/networks -index 205e0a9..df4c0bb 100755 ---- a/mcp/config/states/networks -+++ b/mcp/config/states/networks -@@ -1,3 +1,3 @@ - salt 'ctl01*' cmd.run ". /root/keystonercv3; openstack compute service list; openstack network agent list; openstack stack list; openstack volume service list" - salt 'ctl01*' cmd.run ". /root/keystonercv3; openstack network create --external --default --provider-network-type flat --provider-physical-network physnet1 floating_net" --salt 'ctl01*' cmd.run ". /root/keystonercv3; openstack subnet create --gateway 10.16.0.1 --no-dhcp --allocation-pool start=10.16.0.130,end=10.16.0.254 --network floating_net --subnet-range 10.16.0.0/24 floating_subnet" -+salt 'ctl01*' cmd.run ". /root/keystonercv3; openstack subnet create --gateway 10.0.9.254 --no-dhcp --allocation-pool start=10.0.9.130,end=10.0.9.200 --network floating_net --subnet-range 10.0.9.0/24 floating_subnet" -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml -index 57c6cec..f519e22 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml -@@ -51,16 +51,16 @@ parameters: - params: - single_address: 172.16.10.105 - tenant_address: 10.1.0.105 -- external_address: 10.16.0.105 -+ external_address: 10.0.9.105 - openstack_compute_node02: - params: - single_address: 172.16.10.106 - tenant_address: 10.1.0.106 -- external_address: 10.16.0.106 -+ external_address: 10.0.9.106 - openstack_gateway_node01: - params: - tenant_address: 10.1.0.110 -- external_address: 10.16.0.110 -+ external_address: 10.0.9.110 - opendaylight_control_node01: - classes: - - cluster.${_param:cluster_name}.opendaylight.control -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml -index 66e5a97..98625ff 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml -@@ -6,7 +6,7 @@ parameters: - openstack_region: RegionOne - admin_email: root@localhost - cluster_public_protocol: http -- cluster_public_host: 10.16.0.101 -+ cluster_public_host: 10.0.9.101 - neutron_public_protocol: http - neutron_control_dvr: False - neutron_tenant_network_types: "flat,vxlan" -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml -index aec6cde..b69258f 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml -@@ -50,17 +50,17 @@ parameters: - params: - single_address: 172.16.10.105 - tenant_address: 10.1.0.105 -- external_address: 10.16.0.105 -+ external_address: 10.0.9.105 - dpdk0_name: enp3s0 - dpdk0_pci: '"0000:00:05.0"' - openstack_compute_node02: - params: - single_address: 172.16.10.106 - tenant_address: 10.1.0.106 -- external_address: 10.16.0.106 -+ external_address: 10.0.9.106 - dpdk0_name: enp3s0 - dpdk0_pci: '"0000:00:05.0"' - openstack_gateway_node01: - params: - tenant_address: 10.1.0.110 -- external_address: 10.16.0.110 -+ external_address: 10.0.9.110 -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml -index dfc0b51..b106e86 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml -@@ -6,7 +6,7 @@ parameters: - openstack_region: RegionOne - admin_email: root@localhost - cluster_public_protocol: http -- cluster_public_host: 10.16.0.101 -+ cluster_public_host: 10.0.9.101 - neutron_public_protocol: http - neutron_control_dvr: False - neutron_tenant_network_types: "flat,vlan" -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml -index 8cb0992..c8f8477 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml -@@ -50,13 +50,13 @@ parameters: - params: - single_address: 172.16.10.105 - tenant_address: 10.1.0.105 -- external_address: 10.16.0.105 -+ external_address: 10.0.9.105 - openstack_compute_node02: - params: - single_address: 172.16.10.106 - tenant_address: 10.1.0.106 -- external_address: 10.16.0.106 -+ external_address: 10.0.9.106 - openstack_gateway_node01: - params: - tenant_address: 10.1.0.110 -- external_address: 10.16.0.110 -+ external_address: 10.0.9.110 -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml -index 7079fd1..fccde1f 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml -@@ -6,7 +6,7 @@ parameters: - openstack_region: RegionOne - admin_email: root@localhost - cluster_public_protocol: http -- cluster_public_host: 10.16.0.101 -+ cluster_public_host: 10.0.9.101 - neutron_public_protocol: http - neutron_control_dvr: False - neutron_tenant_network_types: "flat,vxlan" -diff --git a/mcp/scripts/net_public.xml b/mcp/scripts/net_public.xml -index 61650d5..f455480 100644 ---- a/mcp/scripts/net_public.xml -+++ b/mcp/scripts/net_public.xml -@@ -2,5 +2,5 @@ - public - - -- -+ - diff --git a/patches/opnfv-fuel/0007-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch b/patches/opnfv-fuel/0007-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch deleted file mode 100644 index 267407cb..00000000 --- a/patches/opnfv-fuel/0007-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: Alexandru Avadanii -Date: Thu, 27 Jul 2017 23:42:29 +0200 -Subject: [PATCH] mcp: salt-formulas: opendaylight: AArch64 leveldb - -ODL requires native leveldbjni support on architectures like AArch64. -Armband provides a Debian package that provides exactly that, -specially tailored to be applied on top of upstream Opendaylight -Debian package. - -Install as part of the existing Opendaylight -salt-formula (and not as part of Armband's separate salt-formula, like -previous fixups). - -Some dependencies are not self-contained in this formula yet, and -should be handled before upstreaming this patch: -- Armband DEB repository (mcp-repos) is added by "openstack" state; -- only Debian systems are supported (no equivalent RPM provided); -- only systemd is supported (unlikely to change); - -JIRA: https://jira.opnfv.org/browse/ARMBAND-283 - -Signed-off-by: Alexandru Avadanii ---- - mcp/salt-formulas/opendaylight/server.sls | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/mcp/salt-formulas/opendaylight/server.sls b/mcp/salt-formulas/opendaylight/server.sls -index 8c6c3b2..a2236ae 100644 ---- a/mcp/salt-formulas/opendaylight/server.sls -+++ b/mcp/salt-formulas/opendaylight/server.sls -@@ -58,4 +58,9 @@ opendaylight: - - service: opendaylight - {%- endif %} - -+opendaylight_aarch64_leveldbjni: -+ pkg.installed: -+ {% if grains['cpuarch'] == 'aarch64'%} -+ - name: armband-odl-leveldb-fix -+ {% endif %} - {%- endif %} -- cgit 1.2.3-korg