From 7d67ff7fd61e09f802f2bc880ae1edbc1e83295d Mon Sep 17 00:00:00 2001 From: John Dewey Date: Mon, 3 Jun 2013 15:27:48 -0700 Subject: [PATCH] Use new cookbook name for service_password Bring this cookbook in line with other cookbooks (openstack-block-storage), already following this pattern. Change-Id: I34d40d102b94459d700fbd290fad684297e27e66 --- recipes/api-ec2.rb | 2 +- recipes/api-metadata.rb | 2 +- recipes/api-os-compute.rb | 2 +- recipes/ceilometer-common.rb | 2 +- recipes/identity_registration.rb | 2 +- spec/spec_helper.rb | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes/api-ec2.rb b/recipes/api-ec2.rb index 214d31cf..1a1ac38f 100644 --- a/recipes/api-ec2.rb +++ b/recipes/api-ec2.rb @@ -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" diff --git a/recipes/api-metadata.rb b/recipes/api-metadata.rb index a4847a35..5921e20b 100644 --- a/recipes/api-metadata.rb +++ b/recipes/api-metadata.rb @@ -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" diff --git a/recipes/api-os-compute.rb b/recipes/api-os-compute.rb index bd2285fa..01d8927e 100644 --- a/recipes/api-os-compute.rb +++ b/recipes/api-os-compute.rb @@ -60,7 +60,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" diff --git a/recipes/ceilometer-common.rb b/recipes/ceilometer-common.rb index 267b1855..3d5b8444 100644 --- a/recipes/ceilometer-common.rb +++ b/recipes/ceilometer-common.rb @@ -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 diff --git a/recipes/identity_registration.rb b/recipes/identity_registration.rb index eb772df3..02ec742e 100644 --- a/recipes/identity_registration.rb +++ b/recipes/identity_registration.rb @@ -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"] diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 6a3481e9..2d52d9b2 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -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