diff options
Diffstat (limited to 'mcp/config/states')
| -rwxr-xr-x | mcp/config/states/baremetal_init | 2 | ||||
| -rwxr-xr-x | mcp/config/states/openstack_ha | 6 | ||||
| -rwxr-xr-x | mcp/config/states/openstack_noha | 8 |
3 files changed, 4 insertions, 12 deletions
diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init index 358e1874d..ba7ae30e5 100755 --- a/mcp/config/states/baremetal_init +++ b/mcp/config/states/baremetal_init @@ -27,7 +27,7 @@ salt -C "${cluster_nodes_query}" file.replace $debian_ip_source \ repl="\n if not __salt__['pkg.version']('vlan'):\n __salt__['pkg.install']('vlan')" salt -C "${cluster_nodes_query}" pkg.install bridge-utils -salt -C "${control_nodes_query}" state.apply linux.network,linux.system.kernel +salt -C "${control_nodes_query}" state.apply linux.system.repo,linux.network,linux.system.kernel wait_for 5.0 "salt -C '${cluster_nodes_query}' state.apply salt.minion" wait_for 5.0 "salt -C '${compute_nodes_query}' state.apply linux.system,linux.network" wait_for 30.0 "salt -C '${cluster_nodes_query}' test.ping" 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 98e2eff73..f79d9f657 100755 --- a/mcp/config/states/openstack_noha +++ b/mcp/config/states/openstack_noha @@ -38,14 +38,10 @@ salt -I 'heat:server' state.sls heat 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 |