openstack/cookbook-openstack-common
Code Issues Proposed changes

Remove user_password, db_password and service_password

Browse Source 
All cookbooks are using "get_password" now, so removing the redundant
functions as a "clean-up"

Fixes bug: #1195915

Change-Id: I2c651fdf43935263ea60bc48fa7785dd006c2940
This commit is contained in:
Andy McCrae 2014-01-20 10:40:19 +00:00
parent bca08b3b94
commit 4be974630f
1 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libraries/passwords.rb
View File

@ -46,6 +46,9 @@ module ::Openstack
::Chef::EncryptedDataBagItem.load(bag_name, index, secret)[index]
end
# Ease-of-use/standarization routine that returns a service/database/user
# password for a named OpenStack service/database/user. Accepts "user",
# "service" or "db" as the type.
def get_password type, key
if ["db", "user", "service"].include?(type)
secret node["openstack"]["secret"]["#{type}_passwords_data_bag"], key
@ -53,29 +56,4 @@ module ::Openstack
::Chef::Log.error("Unsupported type for get_password: #{type}")
end
end
# TODO(andymccr): Remove these once other changes have merged to use get_password
# Ease-of-use/standardization routine that returns a service password
# for a named OpenStack service. Note that databases are named
# after the OpenStack project nickname, like "nova" or "glance"
def service_password service
bag = node["openstack"]["secret"]["service_passwords_data_bag"]
secret bag, service
end
# Ease-of-use/standardization routine that returns a database password
# for a named OpenStack database. Note that databases are named
# after the OpenStack project nickname, like "nova" or "glance"
def db_password service
bag = node["openstack"]["secret"]["db_passwords_data_bag"]
secret bag, service
end
# Ease-of-use/standardization routine that returns a password
# for a user.
def user_password user
bag = node["openstack"]["secret"]["user_passwords_data_bag"]
secret bag, user
end
end