diff options
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/opnfv-fuel/0001-mcp-config-AArch64-Use-UEFI-arm64-image.patch | 8 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0002-lib.sh-AArch64-Use-VGA-video-mode-for-guests.patch | 12 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0004-classes-virtual-AArch64-virtio-NIC-names-sync.patch | 109 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0005-deploy-Allow-non-root-deploys.patch | 47 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0005-mcp-salt-formulas-Add-enable-armband-formula.patch (renamed from patches/opnfv-fuel/0006-mcp-salt-formulas-Add-enable-armband-formula.patch) | 0 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0006-network-public-Use-arm-virtual2-POD-config.patch (renamed from patches/opnfv-fuel/0007-network-public-Use-arm-virtual2-POD-config.patch) | 0 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0007-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch (renamed from patches/opnfv-fuel/0009-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch) | 0 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0008-reclass-opendaylight-Use-UCA-default-repos.patch | 33 |
8 files changed, 116 insertions, 93 deletions
diff --git a/patches/opnfv-fuel/0001-mcp-config-AArch64-Use-UEFI-arm64-image.patch b/patches/opnfv-fuel/0001-mcp-config-AArch64-Use-UEFI-arm64-image.patch index ee553053..c5ca0a77 100644 --- a/patches/opnfv-fuel/0001-mcp-config-AArch64-Use-UEFI-arm64-image.patch +++ b/patches/opnfv-fuel/0001-mcp-config-AArch64-Use-UEFI-arm64-image.patch @@ -8,13 +8,13 @@ While at it, bump default vCPU number from 2 to 6. Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com> Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> --- - mcp/config/defaults.yaml | 4 ++-- + mcp/config/scenario/virtual/defaults.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/mcp/config/defaults.yaml b/mcp/config/defaults.yaml +diff --git a/mcp/config/scenario/virtual/defaults.yaml b/mcp/config/scenario/virtual/defaults.yaml index b841e88..17fbbfc 100644 ---- a/mcp/config/defaults.yaml -+++ b/mcp/config/defaults.yaml +--- a/mcp/config/scenario/virtual/defaults.yaml ++++ b/mcp/config/scenario/virtual/defaults.yaml @@ -1,6 +1,6 @@ -base_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img +base_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-uefi1.img 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 index 04337f29..7be7e52a 100644 --- 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 @@ -19,22 +19,22 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ci/deploy.sh b/ci/deploy.sh -index a77dd0f..aec8048 100755 +index 7b3bf54..491b955 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh -@@ -270,9 +270,10 @@ pushd "${DEPLOY_DIR}" > /dev/null +@@ -279,9 +279,10 @@ pushd "${DEPLOY_DIR}" > /dev/null # Install required packages - [ -n "$(command -v apt-get)" ] && apt-get install -y \ + [ -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 && \ -+ ln -sf /usr/share/vgabios/vgabios.bin /usr/share/qemu/vgabios-stdvga.bin - [ -n "$(command -v yum)" ] && yum install -y \ ++ 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/${DEPLOY_SCENARIO}.yaml ]]; then + 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 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 index 95655960..bc4f70f7 100644 --- 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 @@ -20,6 +20,11 @@ is used). Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> --- + .../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 ++++---- @@ -33,8 +38,106 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> .../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 ++++---- - 13 files changed, 36 insertions(+), 36 deletions(-) + 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..76c42b5 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: ++ enp2s2: + 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..5140ec5 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: ++ enp2s2: + 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..e29ef08 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: enp2s2 ++ 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..23abc40 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: ++ enp2s2: + 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..1e3703c 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: enp2s2 ++ 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 @@ -49,10 +152,10 @@ index 328d6df..57c6cec 100644 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 6c6640a..ec02e94 100644 +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 -@@ -11,7 +11,7 @@ parameters: +@@ -10,7 +10,7 @@ parameters: linux: network: interface: diff --git a/patches/opnfv-fuel/0005-deploy-Allow-non-root-deploys.patch b/patches/opnfv-fuel/0005-deploy-Allow-non-root-deploys.patch deleted file mode 100644 index 1d86a17c..00000000 --- a/patches/opnfv-fuel/0005-deploy-Allow-non-root-deploys.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -Date: Mon, 17 Jul 2017 23:10:25 +0000 -Subject: [PATCH] deploy: Allow non-root deploys - -Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ---- - ci/deploy.sh | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/ci/deploy.sh b/ci/deploy.sh -index aec8048..d676b76 100755 ---- a/ci/deploy.sh -+++ b/ci/deploy.sh -@@ -87,7 +87,7 @@ $(notify "Disabled input parameters (not yet supported with MCP):" 3) - -i (disabled) .iso image to be deployed (needs to be provided in a URI - style, it can be a local resource: file:// or a remote resource http(s)://) - --$(notify "[NOTE] Root priviledges are needed for this script to run" 3) -+$(notify "[NOTE] sudo priviledges are needed for this script to run" 3) - - Example: - -@@ -240,8 +240,8 @@ do - esac - done - --if [[ $EUID -ne 0 ]]; then -- notify "[ERROR] This script must be run as root\n" 1>&2 -+if [[ "$(sudo whoami)" != 'root' ]]; then -+ notify "This script requires sudo rights\n" 1>&2 - exit 1 - fi - -@@ -269,10 +269,10 @@ pushd "${DEPLOY_DIR}" > /dev/null - # scenario, etc. - - # Install required packages --[ -n "$(command -v apt-get)" ] && apt-get install -y \ -+[ -n "$(command -v apt-get)" ] && sudo apt-get install -y \ - git make rsync mkisofs curl virtinst cpu-checker qemu-kvm vgabios && \ -- ln -sf /usr/share/vgabios/vgabios.bin /usr/share/qemu/vgabios-stdvga.bin --[ -n "$(command -v yum)" ] && yum install -y \ -+ 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 vgabios - - # Check scenario file existence diff --git a/patches/opnfv-fuel/0006-mcp-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0005-mcp-salt-formulas-Add-enable-armband-formula.patch index 0b77805b..0b77805b 100644 --- a/patches/opnfv-fuel/0006-mcp-salt-formulas-Add-enable-armband-formula.patch +++ b/patches/opnfv-fuel/0005-mcp-salt-formulas-Add-enable-armband-formula.patch diff --git a/patches/opnfv-fuel/0007-network-public-Use-arm-virtual2-POD-config.patch b/patches/opnfv-fuel/0006-network-public-Use-arm-virtual2-POD-config.patch index 256a44dc..256a44dc 100644 --- a/patches/opnfv-fuel/0007-network-public-Use-arm-virtual2-POD-config.patch +++ b/patches/opnfv-fuel/0006-network-public-Use-arm-virtual2-POD-config.patch diff --git a/patches/opnfv-fuel/0009-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch b/patches/opnfv-fuel/0007-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch index 267407cb..267407cb 100644 --- a/patches/opnfv-fuel/0009-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch +++ b/patches/opnfv-fuel/0007-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch diff --git a/patches/opnfv-fuel/0008-reclass-opendaylight-Use-UCA-default-repos.patch b/patches/opnfv-fuel/0008-reclass-opendaylight-Use-UCA-default-repos.patch deleted file mode 100644 index 1abad57e..00000000 --- a/patches/opnfv-fuel/0008-reclass-opendaylight-Use-UCA-default-repos.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -Date: Thu, 27 Jul 2017 20:09:46 +0200 -Subject: [PATCH] reclass: opendaylight: Use UCA default repos - -Current opendaylight pillar enforces a full apt repository cleanup, -removing Ubuntu Cloud Archive (UCA) repos in favor of adding -pre-hardcoded Ubuntu archive repos. - -Unlike UCA, main Ubuntu archive is split based on target arch, the -main archive.ubuntu.com holding only x86 packages, while the other -archs are hosted on ports.ubuntu.com. - -This leads to adding (only) x86-specific repositories to our AArch64 -UCA image. - -Mitigate this by ommiting "system.linux.system.repo.ubuntu" from the -opendaylight pillar, leaving the default UCA repos in place. - -Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ---- - .../classes/cluster/virtual-mcp-ocata-odl/opendaylight/control.yml | 1 - - 1 file changed, 1 deletion(-) - -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 ec02e94..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 -@@ -1,5 +1,4 @@ - classes: --- system.linux.system.repo.ubuntu - - system.linux.system.repo.mcp.openstack - - system.linux.system.repo.mcp.extra - - system.linux.system.repo.saltstack.xenial |