diff options
12 files changed, 62 insertions, 60 deletions
diff --git a/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch index 290ecbd6..cbb2a90b 100644 --- a/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch +++ b/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch @@ -68,7 +68,7 @@ index fbddc6e..6bad8da 100755 salt -I 'mongodb:server' state.sls mongodb || true wait_for 90 "salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin'" diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index c355126..99fb517 100755 +index b08a31c..5b519be 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -46,6 +46,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \ diff --git a/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch b/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch index 3e17f899..09f92336 100644 --- a/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch +++ b/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch @@ -64,13 +64,13 @@ index 0000000..0368937 + file.managed: + - source: salt://maas/files/pgpass diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index 6358109..4f6cc56 100644 +index a54fadc..3aa6308 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -18,3 +18,4 @@ +@@ -15,3 +15,4 @@ + /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch /usr/share/salt-formulas/reclass: 0011-service.horizon.server.cluster-Default-to-v2-API.patch /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch - /usr/share/salt-formulas/env: 0013-maas-region-Allow-subnets-without-fabrics.patch +/usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml index e8c2965..b15f9cb 100644 diff --git a/patches/opnfv-fuel/0007-libvirt-Use-libvirt-unix_sock_group.patch b/patches/opnfv-fuel/0007-libvirt-Use-libvirt-unix_sock_group.patch index 581cd71f..34833458 100644 --- a/patches/opnfv-fuel/0007-libvirt-Use-libvirt-unix_sock_group.patch +++ b/patches/opnfv-fuel/0007-libvirt-Use-libvirt-unix_sock_group.patch @@ -48,11 +48,11 @@ index 0000000..003b249 + # Set the UNIX socket permissions for the R/O socket. This is used + # for monitoring VM status only diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index 4f6cc56..688a9af 100644 +index 3aa6308..7110078 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -19,3 +19,4 @@ +@@ -16,3 +16,4 @@ + /usr/share/salt-formulas/reclass: 0011-service.horizon.server.cluster-Default-to-v2-API.patch /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch - /usr/share/salt-formulas/env: 0013-maas-region-Allow-subnets-without-fabrics.patch /usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch +/usr/share/salt-formulas/env: 0102-libvirt-unix_sock_group-s-libvirtd-libvirt.patch diff --git a/patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch index 1ea8f5af..34fe3c5d 100644 --- a/patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch @@ -41,7 +41,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> create mode 100644 mcp/salt-formulas/armband/salt_minion.sls diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index 99fb517..88a4488 100755 +index 5b519be..d8d2d02 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -40,6 +40,7 @@ salt -C 'kvm*' pkg.install bridge-utils diff --git a/patches/opnfv-fuel/0009-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0009-virtng.py-virt.sls-Extend-libvirt_domain.patch index 562dc5d4..d926a0bc 100644 --- a/patches/opnfv-fuel/0009-virtng.py-virt.sls-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0009-virtng.py-virt.sls-Extend-libvirt_domain.patch @@ -150,11 +150,11 @@ index 0000000..a9fe11b + + #salt_control_seed_{{ cluster_name }}_{{ node_name }}: diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index 688a9af..e618d57 100644 +index 7110078..7462165 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -20,3 +20,5 @@ - /usr/share/salt-formulas/env: 0013-maas-region-Allow-subnets-without-fabrics.patch +@@ -17,3 +17,5 @@ + /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch /usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch /usr/share/salt-formulas/env: 0102-libvirt-unix_sock_group-s-libvirtd-libvirt.patch +/usr/share/salt-formulas/env: 0103-virtng-module-Extend-libvirt_domain.patch diff --git a/patches/opnfv-fuel/0010-seedng-module-Add-AArch64-repo.patch b/patches/opnfv-fuel/0010-seedng-module-Add-AArch64-repo.patch index 86a57386..525652db 100644 --- a/patches/opnfv-fuel/0010-seedng-module-Add-AArch64-repo.patch +++ b/patches/opnfv-fuel/0010-seedng-module-Add-AArch64-repo.patch @@ -15,43 +15,45 @@ salt custom py module seedng.py should use custom repo arg Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> --- - mcp/patches/0009-seedng-module-Sync-salt-version.patch | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) + .../0105-seedng-module-Add-AArch64-repo.patch | 22 ++++++++++++++++++++++ + mcp/patches/patches.list | 1 + + 2 files changed, 23 insertions(+) + create mode 100644 mcp/patches/0105-seedng-module-Add-AArch64-repo.patch -diff --git a/mcp/patches/0009-seedng-module-Sync-salt-version.patch b/mcp/patches/0009-seedng-module-Sync-salt-version.patch -index d116c81..20233a9 100644 ---- a/mcp/patches/0009-seedng-module-Sync-salt-version.patch -+++ b/mcp/patches/0009-seedng-module-Sync-salt-version.patch -@@ -8,23 +8,29 @@ - :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: - From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - Date: Mon, 21 Aug 2017 02:03:01 +0200 --Subject: [PATCH] seedng: module: Sync salt version -+Subject: [PATCH] seedng: module: Sync salt version, AArch64 repo - - salt custom py module seedng.py should use the same Salt version - when preinstalling minion for salt-controlled VMs via bootstrap - script. - -+While at it, add AArch64 repo. This used to be a separate patch, but -+we'll squash it in, so reverse-apply checks still work: -+- salt custom py module seedng.py should use custom repo arg -+ "-R linux.enea.com/saltstack" on AArch64 nodes. +diff --git a/mcp/patches/0105-seedng-module-Add-AArch64-repo.patch b/mcp/patches/0105-seedng-module-Add-AArch64-repo.patch +new file mode 100644 +index 0000000..d40e63b +--- /dev/null ++++ b/mcp/patches/0105-seedng-module-Add-AArch64-repo.patch +@@ -0,0 +1,22 @@ ++From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ++Date: Mon, 21 Aug 2017 02:03:01 +0200 ++Subject: [PATCH] seedng: module: Add AArch64 repo + - Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - --- - - diff --git a/_modules/seedng.py b/_modules/seedng.py - --- a/_modules/seedng.py - +++ b/_modules/seedng.py --@@ -256,8 +256,10 @@ -+@@ -256,8 +256,11 @@ - boot_, tmppath = (prep_bootstrap(mpt) - or salt.syspaths.BOOTSTRAP) - # Exec the chroot command --+ arg = 'stable {0}'.format('.'.join(salt.version.__version__.split('.')[:2])) ++salt custom py module seedng.py should use custom repo arg ++"-R linux.enea.com/saltstack" on AArch64 nodes. ++ ++Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ++--- ++ ++diff --git a/_modules/seedng.py b/_modules/seedng.py ++--- a/_modules/seedng.py +++++ b/_modules/seedng.py ++@@ -257,6 +257,7 @@ ++ or salt.syspaths.BOOTSTRAP) ++ # Exec the chroot command ++- arg = 'stable {0}'.format('.'.join(salt.version.__version__.split('.')[:2])) ++ arg = '-R linux.enea.com/saltstack ' if os.uname()[-1] == 'aarch64' else '' ++ arg += 'stable {0}'.format('.'.join(salt.version.__version__.split('.')[:2])) - cmd = 'if type salt-minion; then exit 0; ' - - cmd += 'else sh {0} -c /tmp; fi'.format(os.path.join(tmppath, 'bootstrap-salt.sh')) - + cmd += 'else sh {0} -c /tmp {1}; fi'.format( ++ cmd = 'if type salt-minion; then exit 0; ' ++ cmd += 'else sh {0} -c /tmp {1}; fi'.format( ++ os.path.join(tmppath, 'bootstrap-salt.sh'), arg) +diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list +index 7462165..8f3e583 100644 +--- a/mcp/patches/patches.list ++++ b/mcp/patches/patches.list +@@ -19,3 +19,4 @@ + /usr/share/salt-formulas/env: 0102-libvirt-unix_sock_group-s-libvirtd-libvirt.patch + /usr/share/salt-formulas/env: 0103-virtng-module-Extend-libvirt_domain.patch + /usr/share/salt-formulas/env: 0104-salt-control-virt-Extend-libvirt_domain.patch ++/usr/share/salt-formulas/env: 0105-seedng-module-Add-AArch64-repo.patch diff --git a/patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch index 42fba2e0..3b4f7f31 100644 --- a/patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch +++ b/patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch @@ -21,7 +21,7 @@ Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com> create mode 100644 mcp/salt-formulas/opnfv/adduser.sls diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index 88a4488..298a9de 100755 +index d8d2d02..f326f4c 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -37,6 +37,7 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \ diff --git a/patches/opnfv-fuel/0014-baremetal-linux-image-generic-hwe-16.04-edge.patch b/patches/opnfv-fuel/0014-baremetal-linux-image-generic-hwe-16.04-edge.patch index 6a131c20..7f9ccc5d 100644 --- a/patches/opnfv-fuel/0014-baremetal-linux-image-generic-hwe-16.04-edge.patch +++ b/patches/opnfv-fuel/0014-baremetal-linux-image-generic-hwe-16.04-edge.patch @@ -31,7 +31,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index 298a9de..f569ba2 100755 +index f326f4c..347b2b5 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -39,9 +39,12 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \ diff --git a/patches/opnfv-fuel/0015-Add-pre-install-purge-support-for-base-image.patch b/patches/opnfv-fuel/0015-Add-pre-install-purge-support-for-base-image.patch index 28a31396..68f3caa8 100644 --- a/patches/opnfv-fuel/0015-Add-pre-install-purge-support-for-base-image.patch +++ b/patches/opnfv-fuel/0015-Add-pre-install-purge-support-for-base-image.patch @@ -49,7 +49,7 @@ index 4e90f32..38b4440 100644 **/mcp/scripts/net_mcpcontrol.xml +**/mcp/scripts/*.img diff --git a/ci/deploy.sh b/ci/deploy.sh -index b13e18e..427850f 100755 +index fe2eb14..2c4b7fa 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -15,6 +15,7 @@ @@ -76,7 +76,7 @@ index b13e18e..427850f 100755 eval "$(parse_yaml "${SCENARIO_DIR}/defaults-$(uname -i).yaml")" eval "$(parse_yaml "${SCENARIO_DIR}/${DEPLOY_TYPE}/${DEPLOY_SCENARIO}.yaml")" eval "$(parse_yaml "${LOCAL_PDF_RECLASS}")" -@@ -358,6 +359,23 @@ for node in "${virtual_nodes[@]}"; do +@@ -362,6 +363,23 @@ for node in "${virtual_nodes[@]}"; do done virtual_nodes_data=${virtual_nodes_data%|} @@ -100,7 +100,7 @@ index b13e18e..427850f 100755 # Expand reclass and virsh network templates for tp in "${RECLASS_CLUSTER_DIR}/all-mcp-ocata-common/opnfv/"*.template \ net_*.template; do -@@ -413,7 +431,8 @@ elif [ ${USE_EXISTING_INFRA} -gt 0 ]; then +@@ -417,7 +435,8 @@ elif [ ${USE_EXISTING_INFRA} -gt 0 ]; then check_connection else generate_ssh_key @@ -150,7 +150,7 @@ index b5b78ec..0350afa 100644 # VMs spawned on Foundation Node / Jump Host net ifaces (max 4) opnfv_fn_vm_primary_interface: enp1s0 diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh -index c6d5d26..654f45e 100644 +index 93ee59d..6a9be97 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh @@ -1,4 +1,5 @@ @@ -344,7 +344,7 @@ index c6d5d26..654f45e 100644 - # shellcheck disable=SC2155 local amac=$(virsh domiflist mas01 2>&1| awk '/mcpcontrol/ {print $5; exit}') virsh net-update "mcpcontrol" add ip-dhcp-host \ - "<host mac='${cmac}' name='cfg01' ip='${SALT_MASTER}'/>" --live + "<host mac='${cmac}' name='cfg01' ip='${SALT_MASTER}'/>" --live --config diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index ab096f3..b719aa8 100755 --- a/mcp/scripts/salt.sh diff --git a/patches/opnfv-fuel/0016-AArch64-base-image-pre-install-salt-minion.patch b/patches/opnfv-fuel/0016-AArch64-base-image-pre-install-salt-minion.patch index 78cacc70..ce28bfc4 100644 --- a/patches/opnfv-fuel/0016-AArch64-base-image-pre-install-salt-minion.patch +++ b/patches/opnfv-fuel/0016-AArch64-base-image-pre-install-salt-minion.patch @@ -23,7 +23,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ci/deploy.sh b/ci/deploy.sh -index 427850f..e2e4a1c 100755 +index 2c4b7fa..92319ad 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -272,10 +272,10 @@ pushd "${DEPLOY_DIR}" > /dev/null @@ -60,7 +60,7 @@ index d989819..edcd8d9 100644 pkg: install: diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh -index 654f45e..8dd92e1 100644 +index 6a9be97..5a69609 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh @@ -51,11 +51,15 @@ function mount_image { diff --git a/patches/reclass-system-salt-model/0002-linux.system-AArch64-Remove-mcelog.patch b/patches/reclass-system-salt-model/0002-linux.system-AArch64-Remove-mcelog.patch index 1c33a3a8..5d344dd8 100644 --- a/patches/reclass-system-salt-model/0002-linux.system-AArch64-Remove-mcelog.patch +++ b/patches/reclass-system-salt-model/0002-linux.system-AArch64-Remove-mcelog.patch @@ -20,7 +20,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 1 file changed, 2 deletions(-) diff --git a/linux/system/single/init.yml b/linux/system/single/init.yml -index 8de2dda..c702a48 100644 +index c7c583b..764dfe3 100644 --- a/linux/system/single/init.yml +++ b/linux/system/single/init.yml @@ -19,8 +19,6 @@ parameters: @@ -29,6 +29,6 @@ index 8de2dda..c702a48 100644 version: purged - mcelog: - version: latest - kernel: - modules: - - nf_conntrack + apt: + config: + compression-workaround: diff --git a/upstream/fuel b/upstream/fuel -Subproject 74a5bd6ae60916c664b0ec902418e3fae234b0c +Subproject 78878a33010e0bbec01196dfc5cc37656751237 |