From 6632d4ceef91ba73cba250febf8dfcf660f4cf5d Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Wed, 23 Jul 2014 14:23:23 -0600 Subject: [PATCH] Fix keystone regression on devstack server Change-Id: I462812fc5bc0b180282d4a34dae571b19d5ee5fd --- cookbooks/devstack/metadata.rb | 4 ++-- cookbooks/devstack/recipes/default.rb | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/cookbooks/devstack/metadata.rb b/cookbooks/devstack/metadata.rb index b577466..e791f2b 100644 --- a/cookbooks/devstack/metadata.rb +++ b/cookbooks/devstack/metadata.rb @@ -2,6 +2,6 @@ name "devstack" maintainer "Mon Team" maintainer_email "hpcs-mon@hp.com" license "All rights reserved" -description "Build customized devstack server" +description "Customizes devstack server for use with mini-mon" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "0.0.1" +version "0.0.2" diff --git a/cookbooks/devstack/recipes/default.rb b/cookbooks/devstack/recipes/default.rb index b311b5a..9ed6e1d 100644 --- a/cookbooks/devstack/recipes/default.rb +++ b/cookbooks/devstack/recipes/default.rb @@ -1,3 +1,14 @@ -# As of 2014-07-10, Keystone is no longer run as a daemon, but under Apache. -# Therefore, this recipe, which prepared keystone.conf for mini-mon use, -# is no longer necessary, but left in place in case future tweaks are needed. +# Modify devstack image (https://vagrantcloud.com/monasca/devstack) as needed +# for use in mini-mon + +my_ip = '192.168.10.5' +ks_conf = '/etc/keystone/keystone.conf' + +# Modify keystone configuration to use the IP address specified above +execute "sed -i.bak 's^\\(.*endpoint = http://\\).*\\(:.*\\)^\\1#{my_ip}\\2^' #{ks_conf}" + +# Reload the apache configuration following this change +service "apache2" do + action :restart +end +