summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Cassiba <s@cassiba.com>2018-02-16 11:09:28 -0800
committerSamuel Cassiba <s@cassiba.com>2018-02-16 11:15:55 -0800
commit36d5f9b92263a781e4374ac75a5190cf26504f01 (patch)
treeffdcd58b295388bd81ddc5410aeacbb1ea4aea91
parentf7895985f4ca2b3a8210077bd09555723a11d95e (diff)
update recipes for Chef 13
-rw-r--r--recipes/common.rb4
-rw-r--r--recipes/identity_registration.rb14
2 files changed, 6 insertions, 12 deletions
diff --git a/recipes/common.rb b/recipes/common.rb
index ada5853..ead8a33 100644
--- a/recipes/common.rb
+++ b/recipes/common.rb
@@ -18,7 +18,7 @@
18# limitations under the License. 18# limitations under the License.
19# 19#
20 20
21class ::Chef::Recipe # rubocop:disable Documentation 21class ::Chef::Recipe
22 include ::Openstack 22 include ::Openstack
23end 23end
24 24
@@ -67,7 +67,7 @@ end
67db_user = node['openstack']['db']['dns']['username'] 67db_user = node['openstack']['db']['dns']['username']
68db_pass = get_password 'db', 'designate' 68db_pass = get_password 'db', 'designate'
69 69
70public_identity_endpoint = identity_uri_transform(public_endpoint 'identity') 70public_identity_endpoint = identity_uri_transform(public_endpoint('identity'))
71identity_endpoint = internal_endpoint 'identity' 71identity_endpoint = internal_endpoint 'identity'
72 72
73bind_services = node['openstack']['bind_service']['all'] 73bind_services = node['openstack']['bind_service']['all']
diff --git a/recipes/identity_registration.rb b/recipes/identity_registration.rb
index d307b1d..71c45ea 100644
--- a/recipes/identity_registration.rb
+++ b/recipes/identity_registration.rb
@@ -20,7 +20,7 @@
20 20
21require 'uri' 21require 'uri'
22 22
23class ::Chef::Recipe # rubocop:disable Documentation 23class ::Chef::Recipe
24 include ::Openstack 24 include ::Openstack
25end 25end
26 26
@@ -49,7 +49,7 @@ connection_params = {
49 openstack_username: admin_user, 49 openstack_username: admin_user,
50 openstack_api_key: admin_pass, 50 openstack_api_key: admin_pass,
51 openstack_project_name: admin_project, 51 openstack_project_name: admin_project,
52 openstack_domain_name: admin_domain 52 openstack_domain_name: admin_domain,
53} 53}
54 54
55# Register DNS Service 55# Register DNS Service
@@ -83,16 +83,10 @@ end
83 83
84# Register Service User 84# Register Service User
85openstack_user service_user do 85openstack_user service_user do
86 role_name service_role
86 project_name service_project_name 87 project_name service_project_name
87 domain_name service_domain_name 88 domain_name service_domain_name
88 password service_pass 89 password service_pass
89 connection_params connection_params 90 connection_params connection_params
90end 91 action [:create, :grant_role]
91
92## Grant Service role to Service User for Service Project ##
93openstack_user service_user do
94 role_name service_role
95 project_name service_project_name
96 connection_params connection_params
97 action :grant_role
98end 92end