diff options
author | Mustapha Lansana <Mustapha.Lansana@windriver.com> | 2014-09-25 09:45:26 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-09-26 09:09:22 -0400 |
commit | d0bef02d7dfff29fc99760cb75aa7a78ae68acca (patch) | |
tree | 369c88b5de71ab35c5a38562afcf01a73b9fb327 /meta-openstack | |
parent | 0304d8c53bdad18348f37526a4de08e52b9ace19 (diff) | |
download | meta-cloud-services-d0bef02d7dfff29fc99760cb75aa7a78ae68acca.tar.gz |
deploychef: use /etc/init.d/run-postinsts to execute scripts
With changes made to the identity class, the postinstall
scripts no longer register users and services with keystone.
Instead, the registration is put inside the file
/etc/keystone/service-user-setup by the postinstall scripts.
Executing /etc/keystone/service-user-setup then registers
the users and services with keystone through /etc/keystone/identity.sh.
Therefore, executing just the postinstall scripts is not enough
enough to properly bring up the stack. However, executing
/etc/init.d/run-postinsts does both.
In addition, we are executing scripts within run-deploy in the
current shell environment so that the user can see all the updates
to the databases on the terminal.
Signed-off-by: Mustapha Lansana <Mustapha.Lansana@windriver.com>
Diffstat (limited to 'meta-openstack')
-rw-r--r-- | meta-openstack/recipes-support/deploychef/files/run-deploychef | 6 | ||||
-rw-r--r-- | meta-openstack/recipes-support/deploychef/files/run-postinsts | 16 |
2 files changed, 18 insertions, 4 deletions
diff --git a/meta-openstack/recipes-support/deploychef/files/run-deploychef b/meta-openstack/recipes-support/deploychef/files/run-deploychef index e8a8a57..4fd41d8 100644 --- a/meta-openstack/recipes-support/deploychef/files/run-deploychef +++ b/meta-openstack/recipes-support/deploychef/files/run-deploychef | |||
@@ -26,8 +26,8 @@ | |||
26 | # the attributes variables change at run-time. | 26 | # the attributes variables change at run-time. |
27 | # | 27 | # |
28 | #Shutdown all registered services | 28 | #Shutdown all registered services |
29 | . service-shutdown | 29 | . ./service-shutdown |
30 | #Re-generate configuration files from template files | 30 | #Re-generate configuration files from template files |
31 | . run-openstackchef | 31 | . ./run-openstackchef |
32 | #Run post-install script and then start services | 32 | #Run post-install script and then start services |
33 | . run-postinsts | 33 | . ./run-postinsts |
diff --git a/meta-openstack/recipes-support/deploychef/files/run-postinsts b/meta-openstack/recipes-support/deploychef/files/run-postinsts index 737012d..8380927 100644 --- a/meta-openstack/recipes-support/deploychef/files/run-postinsts +++ b/meta-openstack/recipes-support/deploychef/files/run-postinsts | |||
@@ -27,7 +27,21 @@ | |||
27 | # | 27 | # |
28 | source /opt/deploychef/deploychef-inc | 28 | source /opt/deploychef/deploychef-inc |
29 | #Run postinsts scripts | 29 | #Run postinsts scripts |
30 | execute_all_postinsts | 30 | #execute_all_postinsts |
31 | #The registration of tenants/user/services has moved from the postinstall | ||
32 | #scriptis to a single setup file; /etc/keystone/service-user-setup, which | ||
33 | #handles the registration through /etc/keystone/identity.sh script. | ||
34 | #Therefore, execute /etc/init.d/run-postinsts which in-turn runs this script. | ||
35 | if [ -f /etc/keystone/service-user-setup ]; then | ||
36 | #Remove stale tenants/users/services | ||
37 | rm -f /etc/keystone/service-user-setup | ||
38 | fi | ||
39 | if [ -e /etc/init.d/run-postinsts ]; then | ||
40 | echo "Running postinstall scripts" >> $LOG_FILE | ||
41 | sh -c /etc/init.d/run-postinsts | ||
42 | else | ||
43 | echo "EEROR: Tenants/users/services not registered with Keystone" >> $LOG_FILE | ||
44 | fi | ||
31 | #Start all the modules specified in startup-list | 45 | #Start all the modules specified in startup-list |
32 | start_stop_services 'startup-list' | 46 | start_stop_services 'startup-list' |
33 | #Restart cloud service cloud-init | 47 | #Restart cloud service cloud-init |