Sync scripts from stacklight-model
This allows to deploy OpenStack (with OVS or OpenContrail) and
Kubernetes deployments with the same tools.
Change-Id: I5efeab98e70d083a8c54a649b7b59101edc497a6
diff --git a/scripts/openstack_control_install.sh b/scripts/openstack_control_install.sh
index 8291844..86294b0 100755
--- a/scripts/openstack_control_install.sh
+++ b/scripts/openstack_control_install.sh
@@ -5,11 +5,12 @@
salt -C 'I@keystone:server' state.sls keystone.server -b 1
# populate keystone services/tenants/admins
salt -C 'I@keystone:client' state.sls keystone.client
+# salt-minion should be restarted in case keystone.client has changed the Salt configuration
+salt -C 'I@keystone:client' --async service.restart salt-minion; sleep 5
salt -C 'I@keystone:server' cmd.run ". /root/keystonerc; keystone service-list"
-# Install glance and ensure glusterfs clusters
+# Install glance
salt -C 'I@glance:server' state.sls glance -b 1
-salt -C 'I@glance:server' state.sls glusterfs.client
# Update fernet tokens before doing request on keystone server. Otherwise
# you will get an error like:
# "No encryption keys found; run keystone-manage fernet_setup to bootstrap one"
@@ -39,7 +40,9 @@
# Install ceilometer services
salt -C 'I@ceilometer:server' state.sls ceilometer -b 1
-salt -C 'I@heka:ceilometer_collector:enabled:True' state.sls heka.ceilometer_collector
# Install aodh services
salt -C 'I@aodh:server' state.sls aodh -b 1
+
+# Create the Nova resources (if any)
+salt -C 'I@nova:client' state.sls nova