diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2019-01-10 14:07:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-01-10 14:07:23 +0000 |
| commit | bd060e9b47ff971b2e757800138588a58c925633 (patch) | |
| tree | e46cfd0876bc752206332d88dc05d07e4291207c /mcp/config | |
| parent | 455b46a6be4bca145c047ed6957727c119285796 (diff) | |
| parent | 7da37b3418836fa10d802206aed8a560f84cf640 (diff) | |
Merge "[state] Fold aarch64 conditions"
Diffstat (limited to 'mcp/config')
| -rwxr-xr-x | mcp/config/states/openstack_ha | 6 | ||||
| -rwxr-xr-x | mcp/config/states/openstack_noha | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha index ff19a69b8..51db5094b 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -55,11 +55,7 @@ if salt 'cmp*' match.pillar 'neutron:compute:backend:engine:ovn' \ 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 'nova:compute' state.sls nova,armband salt -I 'barbican:server:role:primary' state.sls barbican salt -I 'barbican:server:role:secondary' state.sls barbican -b 1 diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha index 01f686b1f..f79d9f657 100755 --- a/mcp/config/states/openstack_noha +++ b/mcp/config/states/openstack_noha @@ -41,11 +41,7 @@ wait_for 3 "salt -I 'cinder:volume' state.sls cinder" 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 |