diff options
| -rwxr-xr-x | mcp/config/states/openstack_ha | 2 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml | 2 | ||||
| -rwxr-xr-x | mcp/scripts/salt.sh | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha index 2e55fc890..aada4ad45 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -39,6 +39,7 @@ salt -I 'keystone:client' state.sls keystone.client salt -I 'keystone:server' cmd.run ". /root/keystonercv3; openstack service list" salt -I 'glance:server' state.sls glance -b 1 +salt -I 'glusterfs:client' state.sls glusterfs.client salt -I 'keystone:server' state.sls keystone.server salt -I 'nova:controller' state.sls nova -b 1 @@ -51,7 +52,6 @@ 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 'glusterfs:client' state.sls glusterfs.client 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/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml index aca416e94..154013354 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 @@ -42,8 +42,6 @@ parameters: nova_instances: path: /var/lib/nova/instances server: ${_param:glusterfs_service_host} - user: nova - group: nova # yamllint disable-line rule:line-length opts: "defaults,backup-volfile-servers=${_param:cluster_node01_address}:${_param:cluster_node02_address}:${_param:cluster_node03_address}" linux: diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index a1bf644b2..0a2b6bbf8 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -65,7 +65,7 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END salt '*' state.apply salt | grep -Fq 'No response' && salt '*' state.apply salt salt -C 'I@salt:master' state.sls linux - salt -C '* and not cfg01*' state.sls linux + salt -C '* and not cfg01*' state.sls linux || true salt -C '* and not cfg01*' pkg.upgrade refresh=False salt '*' state.sls ntp |