x/monasca-vagrant
Code Issues Proposed changes

Added a retry on the keystone user as in some cases keystone is not yet up.

Browse Source
This commit is contained in:
Tim Kuhlman 2014-06-04 15:53:03 -06:00
parent eba417f87f
commit 37b2116873
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cookbooks/mini-mon/metadata.rb
View File

@ -4,5 +4,5 @@ maintainer_email "hpcs-mon@hp.com"
license "All rights reserved" license "All rights reserved"
description "Base setup for all vagrant boxes" description "Base setup for all vagrant boxes"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version "0.0.5" version "0.0.6"
depends "apt" depends "apt"

12
cookbooks/mini-mon/recipes/keystone.rb
View File

@ -14,10 +14,18 @@ end
python 'make default keystone user' do python 'make default keystone user' do
action :run action :run
code <<-EOH code <<-EOH
import keystoneclient
from keystoneclient.v2_0 import client from keystoneclient.v2_0 import client
import sys import sys
key = client.Client(token='ADMIN', endpoint='http://127.0.0.1:35357/v2.0/') try:
for user in key.users.list(): key = client.Client(token='ADMIN', endpoint='http://127.0.0.1:35357/v2.0/')
user_list = key.users.list()
except keystoneclient.exceptions:
time.sleep(2) # Sometimes chef is too fast and the service is not yet up
key = client.Client(token='ADMIN', endpoint='http://127.0.0.1:35357/v2.0/')
user_list = key.users.list()
for user in user_list:
if user.name == 'mini-mon': if user.name == 'mini-mon':
sys.exit(0) sys.exit(0)