openstack
/
cookbook-openstack-database
Code Issues Proposed changes

switch to using get_password for password attrs support 

Also changed the service/data bag name from 'openstack-database' to
'database' to match the default attribute name from -common

Change-Id: I197c9f03e937ddcc7193f86969dfd9902d6acc0d
This commit is contained in:
Ionuț Arțăriși 2014-06-25 16:56:09 +02:00
parent 37ec31e12d
commit 7195e30f65
7 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -2,6 +2,9 @@
This file is used to list changes made in each version of the cookbook-openstack-database.
## 9.0.1
* Allow setting passwords via attributes by using the get_password method
## 9.0.0
* Initial release of cookbook-openstack-database for Icehouse

4
metadata.rb
View File

@ -4,14 +4,14 @@ maintainer_email 'crowbar@dell.com'
license 'Apache 2.0'
description 'Installs/Configures trove'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '9.0.0'
version '9.0.1'
recipe 'openstack-database::identity_registration', 'Registers Trove endpoints and service with Keystone'
recipe 'openstack-database::api', 'Installs API service'
recipe 'openstack-database::conductor', 'Installs Conductor service'
recipe 'openstack-database::taskmanager', 'Installs TaskManager service'
recipe 'openstack-database::guestagent', 'Installs GuestAgent service'
depends 'openstack-common', '~> 9.0'
depends 'openstack-common', '~> 9.6'
depends 'openstack-identity', '~> 9.0'
supports 'suse'

4
recipes/api.rb
View File

@ -40,7 +40,7 @@ service 'trove-api' do
end
db_user = node['openstack']['db']['database']['username']
db_pass = get_password 'db', 'openstack-database'
db_pass = get_password 'db', 'database'
db_uri = db_uri('database', db_user, db_pass).to_s
api_endpoint = endpoint 'database-api'
@ -72,7 +72,7 @@ template '/etc/trove/trove.conf' do
notifies :restart, 'service[trove-api]', :immediately
end
admin_token = secret 'secrets', 'openstack_identity_bootstrap_token'
admin_token = get_password('token', 'openstack_identity_bootstrap_token')
identity_admin_uri = endpoint('identity-admin')
directory ::File.dirname(node['openstack']['database']['api']['auth']['cache_dir']) do

2
recipes/conductor.rb
View File

@ -36,7 +36,7 @@ service 'trove-conductor' do
end
db_user = node['openstack']['db']['database']['username']
db_pass = get_password 'db', 'openstack-database'
db_pass = get_password 'db', 'database'
db_uri = db_uri('database', db_user, db_pass).to_s
rabbit_pass = get_password(
'user', node['openstack']['mq']['database']['rabbit']['userid'])

4
recipes/identity_registration.rb
View File

@ -25,9 +25,9 @@ class ::Chef::Recipe # rubocop:disable Documentation
end
identity_admin_endpoint = endpoint 'identity-admin'
bootstrap_token = get_secret 'openstack_identity_bootstrap_token'
bootstrap_token = get_password('token', 'openstack_identity_bootstrap_token')
auth_uri = ::URI.decode identity_admin_endpoint.to_s
service_pass = get_password 'service', 'openstack-database'
service_pass = get_password 'service', 'database'
service_user = node['openstack']['database']['service_user']
service_role = node['openstack']['database']['service_role']
service_tenant_name = node['openstack']['database']['service_tenant_name']

2
recipes/taskmanager.rb
View File

@ -36,7 +36,7 @@ service 'trove-taskmanager' do
end
db_user = node['openstack']['db']['database']['username']
db_pass = get_password 'db', 'openstack-database'
db_pass = get_password 'db', 'database'
db_uri = db_uri('database', db_user, db_pass).to_s
identity_uri = endpoint('identity-api')

11
spec/spec_helper.rb
View File

@ -23,15 +23,16 @@ require 'chef/application'
shared_context 'database-stubs' do
before do
Chef::Recipe.any_instance.stub(:secret)
.with('secrets', 'openstack_identity_bootstrap_token').and_return('bootstrap-token')
Chef::Recipe.any_instance.stub(:get_password)
.with('token', 'openstack_identity_bootstrap_token')
.and_return('bootstrap-token')
Chef::Recipe.any_instance.stub(:get_password)
.with('user', 'guest').and_return('rabbit-pass')
Chef::Recipe.any_instance.stub(:get_password)
.with('db', 'openstack-database').and_return('db-pass')
.with('db', 'database').and_return('db-pass')
Chef::Recipe.any_instance.stub(:get_password)
.with('service', 'openstack-database').and_return('service-pass')
.with('service', 'database').and_return('service-pass')
Chef::Recipe.any_instance.stub(:get_password)
.with('user', 'openstack-database').and_return('user-pass')
.with('user', 'database').and_return('user-pass')
end
end