summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Luethi <rl@patchworkscience.org>2017-11-01 10:45:36 +0100
committerSamuel Cassiba <s@cassiba.com>2017-11-16 02:05:30 +0000
commit37737b68c19a8802929e8b7a7e9910b892b46cb7 (patch)
tree440d241c1f269dfb9fe2123287c091c85e6b0563
parentdc2d594b0535b524486c13ed52128d8efff6d334 (diff)
Add comments to identity_registration.rb
Notes
Notes (review): Code-Review+2: Jan Klare <j.klare@cloudbau.de> Code-Review+2: Samuel Cassiba <s@cassiba.com> Workflow+1: Samuel Cassiba <s@cassiba.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 16 Nov 2017 03:02:39 +0000 Reviewed-on: https://review.openstack.org/519338 Project: openstack/cookbook-openstack-orchestration Branch: refs/heads/master
-rw-r--r--recipes/identity_registration.rb15
1 files changed, 14 insertions, 1 deletions
diff --git a/recipes/identity_registration.rb b/recipes/identity_registration.rb
index ce24069..e765123 100644
--- a/recipes/identity_registration.rb
+++ b/recipes/identity_registration.rb
@@ -61,6 +61,9 @@ connection_params = {
61 openstack_domain_name: admin_domain, 61 openstack_domain_name: admin_domain,
62} 62}
63 63
64# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
65# Create Orchestration service, endpoints
66
64# Register Orchestration Service 67# Register Orchestration Service
65openstack_service service_name do 68openstack_service service_name do
66 type service_type 69 type service_type
@@ -93,6 +96,9 @@ openstack_endpoint service_type do
93 connection_params connection_params 96 connection_params connection_params
94end 97end
95 98
99# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
100# Create heat project, heat user
101
96# Register Service Tenant 102# Register Service Tenant
97openstack_project service_project_name do 103openstack_project service_project_name do
98 connection_params connection_params 104 connection_params connection_params
@@ -118,6 +124,9 @@ end
118# Bug: #1309123 reverts 1279577 124# Bug: #1309123 reverts 1279577
119# if node.run_list.include?('openstack-orchestration::api-cfn') 125# if node.run_list.include?('openstack-orchestration::api-cfn')
120 126
127# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
128# Create Cloudformation service, endpoints
129
121# Register Heat API Cloudformation Service 130# Register Heat API Cloudformation Service
122openstack_service 'heat-cfn' do 131openstack_service 'heat-cfn' do
123 type 'cloudformation' 132 type 'cloudformation'
@@ -149,24 +158,28 @@ openstack_endpoint 'cloudformation' do
149 region region 158 region region
150 connection_params connection_params 159 connection_params connection_params
151end 160end
161# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
162# Create heat domain, heat_domain_admin user
152 163
153openstack_domain heat_domain_name do 164openstack_domain heat_domain_name do
154 connection_params connection_params 165 connection_params connection_params
155end 166end
156 167
168# Create heat_domain_admin in domain heat
157openstack_user stack_domain_admin do 169openstack_user stack_domain_admin do
158 domain_name heat_domain_name 170 domain_name heat_domain_name
159 password stack_domain_admin_password 171 password stack_domain_admin_password
160 connection_params connection_params 172 connection_params connection_params
161end 173end
162 174
175# Grant role to heat_domain_admin in domain heat
163openstack_user stack_domain_admin do 176openstack_user stack_domain_admin do
164 domain_name heat_domain_name 177 domain_name heat_domain_name
165 role_name 'admin' 178 role_name 'admin'
166 connection_params connection_params 179 connection_params connection_params
167 action :grant_domain 180 action :grant_domain
168end 181end
169 182# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
170openstack_role 'heat_stack_owner' do 183openstack_role 'heat_stack_owner' do
171 connection_params connection_params 184 connection_params connection_params
172end 185end