openstack
/
cookbook-openstack-compute
Code Issues Proposed changes

Merge "Use new cookbook name for service_password"

This commit is contained in:
Jenkins 2013-06-04 00:25:01 +00:00 committed by Gerrit Code Review
parent 84fbc783cf 7d67ff7fd6
commit 6e6f4dc6f7
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
recipes/api-ec2.rb
View File

@ -54,7 +54,7 @@ service "nova-api-ec2" do
end
identity_admin_endpoint = endpoint "identity-admin"
service_pass = service_password "nova"
service_pass = service_password "openstack-compute"
template "/etc/nova/api-paste.ini" do
source "api-paste.ini.erb"

2
recipes/api-metadata.rb
View File

@ -60,7 +60,7 @@ identity_admin_endpoint = endpoint "identity-admin"
identity_service_role = node["openstack"]["compute"]["identity_service_chef_role"]
auth_uri = ::URI.decode identity_admin_endpoint.to_s
service_pass = service_password "nova"
service_pass = service_password "openstack-compute"
template "/etc/nova/api-paste.ini" do
source "api-paste.ini.erb"

2
recipes/api-os-compute.rb
View File

@ -58,7 +58,7 @@ service "nova-api-os-compute" do
end
identity_admin_endpoint = endpoint "identity-admin"
service_pass = service_password "nova"
service_pass = service_password "openstack-compute"
template "/etc/nova/api-paste.ini" do
source "api-paste.ini.erb"

2
recipes/ceilometer-common.rb
View File

@ -106,7 +106,7 @@ ceilo_db_query = ceilo_db_info['db_type'] == 'mysql' ? '?charset=utf8' : ''
ceilo_db_uri = db_uri("metering", ceilo_db_user, ceilo_db_pass).to_s + ceilo_db_query
service_user = node["openstack"]["compute"]["service_user"]
service_pass = service_password "nova"
service_pass = service_password "openstack-compute"
service_tenant = node["openstack"]["compute"]["service_tenant_name"]
# find the node attribute endpoint settings for the server holding a given role

2
recipes/identity_registration.rb
View File

@ -26,7 +26,7 @@ end
identity_admin_endpoint = endpoint "identity-admin"
bootstrap_token = secret "secrets", "openstack_identity_bootstrap_token"
auth_uri = ::URI.decode identity_admin_endpoint.to_s
service_pass = service_password "nova"
service_pass = service_password "openstack-compute"
service_user = node["openstack"]["compute"]["service_user"]
service_role = node["openstack"]["compute"]["service_role"]
service_tenant_name = node["openstack"]["compute"]["service_tenant_name"]

2
spec/spec_helper.rb
View File

@ -33,7 +33,7 @@ def compute_stubs
and_return "bootstrap-token"
::Chef::Recipe.any_instance.stub(:db_password).and_return String.new
::Chef::Recipe.any_instance.stub(:user_password).and_return String.new
::Chef::Recipe.any_instance.stub(:service_password).with("nova").
::Chef::Recipe.any_instance.stub(:service_password).with("openstack-compute").
and_return "nova-pass"
::Chef::Recipe.any_instance.stub(:memcached_servers).and_return []
end