diff options
6 files changed, 43 insertions, 43 deletions
diff --git a/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch index 0afc2d98..b211e50e 100644 --- a/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch +++ b/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch @@ -28,9 +28,9 @@ Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com> Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com> Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> --- - mcp/config/states/maas | 1 + mcp/config/states/openstack | 2 + mcp/config/states/openstack_ha | 1 + + mcp/config/states/virtual_control_plane | 1 + ...ate-vga-console-defaults-for-armv7-aarch64.diff | 48 ++++++++++++++++++++++ ...nova-libvirt-AArch64-ACPI-depends-on-AAVMF.diff | 45 ++++++++++++++++++++ mcp/salt-formulas/armband/init.sls | 6 +++ @@ -47,18 +47,6 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> create mode 100644 mcp/salt-formulas/armband/qemu.sls create mode 100644 mcp/salt-formulas/armband/vgabios.sls -diff --git a/mcp/config/states/maas b/mcp/config/states/maas -index 67ef6d5..ad61b97 100755 ---- a/mcp/config/states/maas -+++ b/mcp/config/states/maas -@@ -90,6 +90,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | fgrep -q 'Not connected - - salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp - -+salt -C 'kvm*' state.sls armband - salt -C 'kvm*' state.sls libvirt - - salt -C '* and not cfg01* and not mas01*' state.apply salt diff --git a/mcp/config/states/openstack b/mcp/config/states/openstack index beb6abb..885f2ac 100755 --- a/mcp/config/states/openstack @@ -70,17 +58,29 @@ index beb6abb..885f2ac 100755 + +salt -I 'nova:compute' state.sls armband diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha -index 78da80a..dcceb02 100755 +index c4c513d..9084678 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha -@@ -41,6 +41,7 @@ salt -I 'neutron:server' state.sls neutron -b 1 +@@ -44,6 +44,7 @@ salt -I 'neutron:server' state.sls neutron -b 1 salt -I 'neutron:gateway' state.sls neutron.gateway salt -I 'nova:compute' state.sls nova +salt -I 'nova:compute' state.sls armband salt -I 'mongodb:server' state.sls mongodb - while true; do sleep 5; salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin' && break; done + 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 645009b..79ad880 100755 +--- a/mcp/config/states/virtual_control_plane ++++ b/mcp/config/states/virtual_control_plane +@@ -12,6 +12,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | grep -Fq 'Not connected + + salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp + ++salt -C 'kvm*' state.sls armband + salt -C 'kvm*' state.sls libvirt + + salt -C '* and not cfg01* and not mas01*' state.apply salt diff --git a/mcp/salt-formulas/armband/files/nova-Update-vga-console-defaults-for-armv7-aarch64.diff b/mcp/salt-formulas/armband/files/nova-Update-vga-console-defaults-for-armv7-aarch64.diff new file mode 100644 index 0000000..a5b08da 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 6a782a90..73a0a786 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 @@ -21,18 +21,18 @@ specific values. Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> --- - mcp/config/states/maas | 2 +- + mcp/config/states/virtual_control_plane | 2 +- .../armband/files/libvirt_domain.jinja.diff | 46 ++++++++++++++++++++++ .../armband/libvirt_domain_template.sls | 4 ++ 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 mcp/salt-formulas/armband/files/libvirt_domain.jinja.diff create mode 100644 mcp/salt-formulas/armband/libvirt_domain_template.sls -diff --git a/mcp/config/states/maas b/mcp/config/states/maas -index ad61b97..baa9b13 100755 ---- a/mcp/config/states/maas -+++ b/mcp/config/states/maas -@@ -90,7 +90,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | fgrep -q 'Not connected +diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane +index 79ad880..327b159 100755 +--- a/mcp/config/states/virtual_control_plane ++++ b/mcp/config/states/virtual_control_plane +@@ -12,7 +12,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | grep -Fq 'Not connected salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp diff --git a/patches/opnfv-fuel/0010-mcp-salt-formulas-armband-AArch64-bootstrap.patch b/patches/opnfv-fuel/0010-mcp-salt-formulas-armband-AArch64-bootstrap.patch index 1f4d0e85..bb1443d3 100644 --- a/patches/opnfv-fuel/0010-mcp-salt-formulas-armband-AArch64-bootstrap.patch +++ b/patches/opnfv-fuel/0010-mcp-salt-formulas-armband-AArch64-bootstrap.patch @@ -24,24 +24,24 @@ to pick up the changes, so we'll run it before rebooting kvm nodes. Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> --- - mcp/config/states/maas | 1 + + mcp/config/states/virtual_control_plane | 1 + .../armband/bootstrap_script_arm64.sls | 4 +++ mcp/salt-formulas/armband/files/cloud.py.diff | 29 ++++++++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 mcp/salt-formulas/armband/bootstrap_script_arm64.sls create mode 100644 mcp/salt-formulas/armband/files/cloud.py.diff -diff --git a/mcp/config/states/maas b/mcp/config/states/maas -index baa9b13..68390c0 100755 ---- a/mcp/config/states/maas -+++ b/mcp/config/states/maas -@@ -85,6 +85,7 @@ salt -C '* and not cfg01* and not mas01*' saltutil.sync_all - +diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane +index 327b159..59424ac 100755 +--- a/mcp/config/states/virtual_control_plane ++++ b/mcp/config/states/virtual_control_plane +@@ -7,6 +7,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh" + # KVM, compute node prereqs (libvirt first), VCP deployment salt -C 'kvm*' pkg.install bridge-utils salt -C 'kvm*' state.apply linux.network +salt -C 'kvm*' state.apply armband.bootstrap_script_arm64 salt -C 'kvm*' system.reboot - wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | fgrep -q 'Not connected'" + wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | grep -Fq 'Not connected'" diff --git a/mcp/salt-formulas/armband/bootstrap_script_arm64.sls b/mcp/salt-formulas/armband/bootstrap_script_arm64.sls new file mode 100644 diff --git a/patches/opnfv-fuel/0012-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch b/patches/opnfv-fuel/0012-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch index e0388403..6164d23d 100644 --- a/patches/opnfv-fuel/0012-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch +++ b/patches/opnfv-fuel/0012-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch @@ -31,14 +31,14 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 1 file changed, 10 insertions(+) diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh -index fcc5d76..c0eb330 100644 +index 3a6deec..c355141 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh -@@ -28,6 +28,15 @@ get_base_image() { +@@ -28,6 +28,15 @@ function get_base_image { wget -P "${image_dir}" -N "${base_image}" } -+cleanup_uefi() { ++function cleanup_uefi { + # Clean up Ubuntu boot entry if cfg01, kvm nodes online from previous deploy + # shellcheck disable=SC2086 + ssh ${SSH_OPTS} "ubuntu@${SALT_MASTER}" "sudo salt -C 'kvm* or cmp*' cmd.run \ @@ -47,10 +47,10 @@ index fcc5d76..c0eb330 100644 + xargs -I{} efibootmgr --delete-bootnum --bootnum {}\"" || true +} + - cleanup_vms() { + function cleanup_vms { # clean up existing nodes for node in $(virsh list --name | grep -P '\w{3}\d{2}'); do -@@ -45,6 +54,7 @@ prepare_vms() { +@@ -45,6 +54,7 @@ function prepare_vms { local base_image=$2 local image_dir=$3 diff --git a/patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch index ebc43d7e..0b6598b8 100644 --- a/patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch +++ b/patches/opnfv-fuel/0015-Add-opnfv-user-to-the-deployment.patch @@ -14,25 +14,25 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com> Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com> --- - mcp/config/states/maas | 2 ++ + mcp/config/states/virtual_control_plane | 2 ++ mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml | 4 ++++ mcp/salt-formulas/opnfv/adduser.sls | 7 +++++++ 3 files changed, 13 insertions(+) create mode 100644 mcp/salt-formulas/opnfv/adduser.sls -diff --git a/mcp/config/states/maas b/mcp/config/states/maas -index 68390c0..036f76a 100755 ---- a/mcp/config/states/maas -+++ b/mcp/config/states/maas -@@ -84,6 +84,7 @@ salt -C 'mas01*' pillar.item\ - salt -C '* and not cfg01* and not mas01*' saltutil.sync_all +diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane +index 59424ac..12fff84 100755 +--- a/mcp/config/states/virtual_control_plane ++++ b/mcp/config/states/virtual_control_plane +@@ -6,6 +6,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh" + # KVM, compute node prereqs (libvirt first), VCP deployment salt -C 'kvm*' pkg.install bridge-utils +salt -C '*' state.apply opnfv.adduser salt -C 'kvm*' state.apply linux.network salt -C 'kvm*' state.apply armband.bootstrap_script_arm64 salt -C 'kvm*' system.reboot -@@ -108,6 +109,7 @@ while [ $rc -ne 0 ]; do +@@ -30,6 +31,7 @@ while [ $rc -ne 0 ]; do rc=0 for node in $vcp_nodes; do salt "$node" test.ping 2>/dev/null || { rc=$?; break; }; diff --git a/upstream/fuel b/upstream/fuel -Subproject c11eb920a3570ed22b252bbb8eecfb5231f5db1 +Subproject 089585ad5370109d4c2a476b94b0017153d7713 |