Skip to content
Browse files

Merge pull request #43 from VictorLowther/pull-req-master-4e36ffea37

Update development tree to use Folsom as our base Openstack distro. [4/6]
  • Loading branch information...
2 parents ba596ff + 4e36ffe commit 83d895f42f780eab3063f93cb5f3cb1a8df7da2a @galthaus galthaus committed Oct 18, 2012
View
15 chef/cookbooks/keystone/recipes/server.rb
@@ -223,6 +223,21 @@
action :add_endpoint_template
end
+template "/root/.openrc" do
+ source "openrc.erb"
+ owner "root"
+ group "root"
+ mode 0600
+ variables(
+ :keystone_ip_address => pub_ipaddress,
+ :keystone_service_port => node[:keystone][:api][:service_port],
+ :admin_username => node[:keystone][:admin][:username],
+ :admin_password => node[:keystone][:admin][:password],
+ :default_tenant => node[:keystone][:admin][:tenant]
+ )
+end
+
+
node[:keystone][:monitor] = {} if node[:keystone][:monitor].nil?
node[:keystone][:monitor][:svcs] = [] if node[:keystone][:monitor][:svcs].nil?
node[:keystone][:monitor][:svcs] << ["keystone"] if node[:keystone][:monitor][:svcs].empty?
View
2 chef/cookbooks/keystone/templates/default/keystone.conf.erb
@@ -63,7 +63,7 @@ driver = keystone.catalog.backends.sql.Catalog
driver = keystone.token.backends.sql.Token
[policy]
-driver = keystone.policy.backends.simple.SimpleMatch
+driver = keystone.policy.backends.rules.Policy
[ec2]
driver = keystone.contrib.ec2.backends.sql.Ec2
View
6 chef/cookbooks/keystone/templates/default/openrc.erb
@@ -0,0 +1,6 @@
+OS_AUTH_URL="http://<%=@keystone_ip_address%>:<%=@keystone_service_port%>/v2.0/"
+OS_USERNAME="<%=@admin_username%>"
+OS_PASSWORD="<%=@admin_password%>"
+OS_TENANT_NAME="<%=@default_tenant%>"
+OS_NO_CACHE=1
+export OS_AUTH_URL OS_USERNAME OS_PASSWORD OS_TENANT_NAME OS_NO_CACHE
View
10 crowbar.yml
@@ -32,15 +32,9 @@ crowbar:
chef_order: 75
debs:
- ubuntu-10.10:
+ ubuntu-12.04:
repos:
- - deb http://ops.rcb.me/packages maverick diablo-final
- ubuntu-11.04:
- repos:
- - deb http://ops.rcb.me/packages natty diablo-final
- ubuntu-11.10:
- repos:
- - deb http://ops.rcb.me/packages oneiric diablo-final
+ - deb http://ubuntu-cloud.archive.canonical.com/ubuntu precise-updates/folsom main
pkgs:
- keystone
- python-keystone

0 comments on commit 83d895f

Please sign in to comment.
Something went wrong with that request. Please try again.