diff options
9 files changed, 38 insertions, 39 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 c09d21a7..7883349b 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 @@ -48,37 +48,37 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> create mode 100644 mcp/salt-formulas/armband/vgabios.sls diff --git a/mcp/config/states/openstack b/mcp/config/states/openstack -index 9683103..624b08e 100755 +index 19cd417..73983d2 100755 --- a/mcp/config/states/openstack +++ b/mcp/config/states/openstack -@@ -41,3 +41,5 @@ salt -I 'ceilometer:server' state.sls ceilometer +@@ -43,3 +43,5 @@ salt -I 'ceilometer:server' state.sls ceilometer salt -I 'ceilometer:agent' state.sls ceilometer salt -I 'horizon:server' state.sls horizon + -+salt -I 'nova:compute' state.sls armband ++salt -I 'nova:compute' state.sls armband || true diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha -index 230288f..921b216 100755 +index aada4ad..afd6c53 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha -@@ -50,6 +50,7 @@ salt -I 'neutron:server' state.sls neutron -b 1 +@@ -52,6 +52,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 'nova:compute' state.sls armband || true salt -I 'mongodb:server' state.sls mongodb 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 58ae335..c645ffd 100755 +index 9094391..602eab2 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane -@@ -18,6 +18,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | grep -Fq 'Not connected +@@ -22,6 +22,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \ 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 'kvm*' state.sls armband || true + wait_for 5 "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 diff --git a/patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch b/patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch index 59ec3117..2ebf8ffa 100644 --- a/patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch +++ b/patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch @@ -41,10 +41,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mcp/config/states/networks b/mcp/config/states/networks -index 361e675..e49401c 100755 +index d4735ad..e566903 100755 --- a/mcp/config/states/networks +++ b/mcp/config/states/networks -@@ -16,7 +16,7 @@ PUBLIC_NET=$(salt --out yaml 'cmp*' pillar.get _param:external_address | \ +@@ -18,7 +18,7 @@ PUBLIC_NET=$(salt --out yaml 'cmp*' pillar.get _param:external_address | \ pillar.get _param:openstack_compute_node01_external_address | \ awk --re-interval '/[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}/{print $2; exit}') @@ -53,7 +53,7 @@ index 361e675..e49401c 100755 salt 'ctl01*' cmd.run ". /root/keystonercv3; \ openstack compute service list; \ -@@ -27,6 +27,6 @@ salt 'ctl01*' cmd.run ". /root/keystonercv3; \ +@@ -29,6 +29,6 @@ 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; \ diff --git a/patches/opnfv-fuel/0004-classes-baremetal-AArch64-NIC-adaptation.patch b/patches/opnfv-fuel/0004-classes-baremetal-AArch64-NIC-adaptation.patch index 4882446d..c58585e0 100644 --- a/patches/opnfv-fuel/0004-classes-baremetal-AArch64-NIC-adaptation.patch +++ b/patches/opnfv-fuel/0004-classes-baremetal-AArch64-NIC-adaptation.patch @@ -64,7 +64,7 @@ index ce81f42..b270e0f 100644 - - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan} + - ${_param:trunk_nic}.${_param:opnfv_net_mgmt_vlan} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml -index aca416e..07561cd 100644 +index 1540133..d370496 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml @@ -30,7 +30,6 @@ parameters: @@ -75,7 +75,7 @@ index aca416e..07561cd 100644 interface_mtu: 1500 keepalived_vip_interface: br-ctl keepalived_vip_virtual_router_id: 69 -@@ -60,19 +59,13 @@ parameters: +@@ -58,19 +57,13 @@ parameters: type: eth proto: dhcp name: ${_param:mgmt_nic} @@ -97,7 +97,7 @@ index aca416e..07561cd 100644 br-ctl: enabled: true type: bridge -@@ -80,7 +73,7 @@ parameters: +@@ -78,7 +71,7 @@ parameters: address: ${_param:single_address} netmask: 255.255.255.0 use_interfaces: @@ -106,7 +106,7 @@ index aca416e..07561cd 100644 br-floating: enabled: true type: ovs_bridge -@@ -97,6 +90,6 @@ parameters: +@@ -95,6 +88,6 @@ parameters: address: ${_param:external_address} netmask: 255.255.255.0 use_interfaces: 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 3db98f5d..7c188244 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,24 +21,23 @@ specific values. Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> --- - mcp/config/states/virtual_control_plane | 2 +- + mcp/config/states/virtual_control_plane | 1 + .../armband/files/libvirt_domain.jinja.diff | 46 ++++++++++++++++++++++ .../armband/libvirt_domain_template.sls | 4 ++ - 3 files changed, 51 insertions(+), 1 deletion(-) + 3 files changed, 51 insertions(+) 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/virtual_control_plane b/mcp/config/states/virtual_control_plane -index c645ffd..fb47893 100755 +index 602eab2..fe84222 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane -@@ -18,7 +18,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | grep -Fq 'Not connected - +@@ -23,6 +23,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \ salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp --salt -C 'kvm*' state.sls armband -+salt -C 'kvm*' state.sls armband,armband.libvirt_domain_template - salt -C 'kvm*' state.sls libvirt + salt -C 'kvm*' state.sls armband || true ++salt -C 'kvm*' state.sls armband.libvirt_domain_template || true + wait_for 5 "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/libvirt_domain.jinja.diff b/mcp/salt-formulas/armband/files/libvirt_domain.jinja.diff 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 988b8fc8..a9e65337 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 @@ -32,17 +32,17 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> create mode 100644 mcp/salt-formulas/armband/files/cloud.py.diff diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index fb47893..899972c 100755 +index fe84222..75386a7 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane -@@ -13,6 +13,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh" - # KVM, compute node prereqs (libvirt first), VCP deployment +@@ -16,6 +16,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh" 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 | grep -Fq 'Not connected'" - + salt -C 'cmp*' state.apply linux.system ++salt -C 'kvm*' state.apply armband.bootstrap_script_arm64 || true + salt -C 'kvm* or cmp*' system.reboot + wait_for 90 "! salt -C 'kvm* or cmp*' 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 index 0000000..845dedd 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 4662d0fd..faa0444c 100644 --- a/patches/opnfv-fuel/0012-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch +++ b/patches/opnfv-fuel/0012-lib.sh-rm-Ubuntu-boot-entry-on-EFI-systems.patch @@ -31,7 +31,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 1 file changed, 10 insertions(+) diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh -index 7449a21..4657195 100644 +index da129a7..1fbe78b 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh @@ -35,6 +35,15 @@ function get_base_image { diff --git a/patches/opnfv-fuel/0013-aarch64-skip-configuration-of-hugepages.patch b/patches/opnfv-fuel/0013-aarch64-skip-configuration-of-hugepages.patch index f97fbf29..af9c1175 100644 --- a/patches/opnfv-fuel/0013-aarch64-skip-configuration-of-hugepages.patch +++ b/patches/opnfv-fuel/0013-aarch64-skip-configuration-of-hugepages.patch @@ -20,7 +20,7 @@ Signed-off-by: Charalampos Kominos <charalampos.kominos@enea.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml -index 07561cd..60c9bb9 100644 +index d370496..bddb1ee 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml @@ -12,8 +12,8 @@ classes: 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 bfcaba12..52d2b4d9 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 @@ -21,18 +21,18 @@ 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 899972c..1ea14b1 100755 +index 75386a7..083dd32 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane -@@ -12,6 +12,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh" +@@ -14,6 +14,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 -@@ -36,6 +37,7 @@ while [ $rc -ne 0 ]; do + salt -C 'cmp*' state.apply linux.system + salt -C 'kvm*' state.apply armband.bootstrap_script_arm64 || true +@@ -41,6 +42,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 644e5fdfa2f49b988a5150e2a4eefc12daecd84 +Subproject 7a1337aeaee3e34ae5c21bb2e9798232f3b2ca2 |