From b0a8b088bcf73302b5fa4d30c8fad6a1612938d5 Mon Sep 17 00:00:00 2001 From: Guillermo Herrero Date: Tue, 25 Jul 2017 00:58:32 +0200 Subject: [salt-formulas] Add & enable armband formula AArch64 specific formula, mostly tweaking nova conf / installing virtualization layer prerequisites: - install qemu-efi; - install vgabios; - fix missing link for vgabios binary blob; - nova conf: cpu_model=cortex-a57 (only for virtual deploys); - nova conf: virt_type=qemu (only for virtual deploys); - nova compute conf: virt_type=qemu (only for virtual deploys); - nova conf: pointer_model=ps2mouse since AArch64 has no USB tablet; [1] https://github.com/openstack/nova/commit/f0f0953 Change-Id: I40515bdbd941850b103a86d51b347cc8610f5741 Signed-off-by: Guillermo Herrero Signed-off-by: Charalampos Kominos Signed-off-by: Alexandru Avadanii --- mcp/config/states/openstack_ha | 6 +++++- mcp/config/states/openstack_noha | 4 ++++ mcp/config/states/virtual_control_plane | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) (limited to 'mcp/config') diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha index d7d8cbd45..0f6858f1e 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -51,11 +51,15 @@ wait_for 3.0 "salt -I 'cinder:volume' state.sls cinder" salt -I 'neutron:server' state.sls neutron -b 1 salt -I 'neutron:gateway' state.sls neutron.gateway if salt 'cmp*' match.pillar 'neutron:compute:backend:engine:ovn' \ - --out yaml --static | grep -q -e "true" ; then + --out yaml --static | grep -q -e 'true' ; then salt -I 'neutron:compute' state.sls neutron.compute fi salt -I 'nova:compute' state.sls nova +if salt -I 'nova:compute' match.grain 'cpuarch:aarch64' \ + --out yaml --static | grep -q -e 'true' ; then + salt -C 'G@cpuarch:aarch64 and I@nova:compute' state.sls armband +fi salt -I 'barbican:server' state.sls barbican -b 1 salt -I 'barbican:client' state.sls barbican diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha index 9a42d4813..44360e5e9 100755 --- a/mcp/config/states/openstack_noha +++ b/mcp/config/states/openstack_noha @@ -45,6 +45,10 @@ salt -I 'neutron:server' state.sls neutron salt -I 'neutron:compute' state.sls neutron salt -I 'nova:compute' state.sls nova +if salt -I 'nova:compute' match.grain 'cpuarch:aarch64' \ + --out yaml --static | grep -q -e 'true' ; then + salt -C 'G@cpuarch:aarch64 and I@nova:compute' state.sls armband +fi salt -I 'barbican:server' state.sls barbican salt -I 'barbican:client' state.sls barbican diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane index 8ea5047ae..4e8d5e573 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -27,6 +27,10 @@ if [ "${ERASE_ENV}" -eq 1 ]; then fi # KVM libvirt first, VCP deployment +if salt -C 'kvm*' match.grain 'cpuarch:aarch64' \ + --out yaml --static | grep -q -e 'true' ; then + wait_for 5.0 "salt -C 'G@cpuarch:aarch64 and kvm*' state.sls armband" +fi wait_for 5.0 "salt -C 'kvm*' state.sls libvirt" salt -C 'kvm* or cmp*' state.apply salt -- cgit 1.2.3-korg