Code Review
/
fuel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Fix barbican integration on compute nodes"
[fuel.git]
/
mcp
/
config
/
states
/
openstack_noha
diff --git
a/mcp/config/states/openstack_noha
b/mcp/config/states/openstack_noha
index
1578dcf
..
9a42d48
100755
(executable)
--- a/
mcp/config/states/openstack_noha
+++ b/
mcp/config/states/openstack_noha
@@
-9,6
+9,9
@@
CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x
CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x
+# shellcheck disable=SC1090
+source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh"
+
salt -I 'nfs:server' file.mkdir /srv/nova/instances
salt -I 'nfs:server' state.sls nfs
salt -I 'nfs:client' state.sls nfs
salt -I 'nfs:server' file.mkdir /srv/nova/instances
salt -I 'nfs:server' state.sls nfs
salt -I 'nfs:client' state.sls nfs
@@
-36,16
+39,21
@@
salt -I 'nova:controller' state.sls nova
salt -I 'heat:server' state.sls heat
salt -I 'cinder:controller' state.sls cinder
salt -I 'heat:server' state.sls heat
salt -I 'cinder:controller' state.sls cinder
-salt -I 'cinder:volume' 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 neutron
-salt -I 'neutron:
gateway
' state.sls neutron
+salt -I 'neutron:
compute
' state.sls neutron
salt -I 'nova:compute' state.sls nova
salt -I 'nova:compute' state.sls nova
-salt -I 'mongodb:server' state.sls mongodb || salt -I 'mongodb:server' state.sls mongodb
+salt -I 'barbican:server' state.sls barbican
+salt -I 'barbican:client' state.sls barbican
+
+salt -I 'redis:server' state.sls redis
+salt -I 'gnocchi:server' state.sls gnocchi
+salt -I 'panko:server' state.sls panko
salt -I 'aodh:server' state.sls aodh
salt -I 'ceilometer:server' state.sls ceilometer
salt -I 'ceilometer:agent' state.sls ceilometer
salt -I 'aodh:server' state.sls aodh
salt -I 'ceilometer:server' state.sls ceilometer
salt -I 'ceilometer:agent' state.sls ceilometer
-salt -I 'horizon:server' state.sls horizon
+salt -I 'horizon:server' state.sls
apache,
horizon