From: Alexandru Avadanii Date: Thu, 10 Jan 2019 14:07:23 +0000 (+0000) Subject: Merge "[state] Fold aarch64 conditions" X-Git-Tag: opnfv-8.0.0~68 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=bd060e9b47ff971b2e757800138588a58c925633;p=fuel.git Merge "[state] Fold aarch64 conditions" --- bd060e9b47ff971b2e757800138588a58c925633 diff --cc mcp/config/states/openstack_noha index 01f686b1f,32b965c6b..f79d9f657 --- a/mcp/config/states/openstack_noha +++ b/mcp/config/states/openstack_noha @@@ -38,14 -38,10 +38,10 @@@ salt -I 'heat:server' state.sls hea salt -I 'cinder:controller' state.sls cinder wait_for 3 "salt -I 'cinder:volume' state.sls cinder" -salt -I 'neutron:server' state.sls neutron +salt -I 'neutron:server' state.sls etcd,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 'nova:compute' state.sls nova,armband salt -I 'barbican:server' state.sls barbican salt -I 'barbican:client' state.sls barbican