Allow attribute for stack_user_domain_id

Change-Id: I69fa92ccd2f274fd14dded07404a682c7cbe9f25
Related-Bug: #1369654

CHANGELOG.md

@@ -16,6 +16,7 @@ This file is used to list changes made in each version of cookbook-openstack-orc
 * Add misc options for heat.conf
 * Add cert_file, key_file, ca_file and insecure for clients_XXX so that they are configurable.
 * Add security arguments for heat-keystone-setup-domain command
+* Allow domain id as attribute
 
 ## 9.2.0
 * python_packages database client attributes have been migrated to

attributes/default.rb

@@ -135,6 +135,11 @@ default['openstack']['orchestration']['api']['auth']['insecure'] = false
 # Keystone role for heat template-defined users. (string value)
 default['openstack']['orchestration']['heat_stack_user_role'] = nil
 
+# Keystone domain id which contains heat template-defined users.
+# If this option is set, stack_user_domain_name option
+# will be ignored. (string value)
+default['openstack']['orchestration']['stack_user_domain_id'] = nil
+
 # Keystone domain name which contains heat template-defined users. (string value)
 default['openstack']['orchestration']['stack_user_domain_name'] = nil
 

spec/spec_helper.rb

@@ -351,6 +351,7 @@ shared_examples 'expects to create heat conf' do
         [
           /^heat_stack_user_role=/,
           /^stack_user_domain_name=/,
+          /^stack_user_domain_id=/,
           /^stack_domain_admin=/,
           /^stack_domain_admin_password=/
         ].each do |line|
@@ -361,10 +362,12 @@ shared_examples 'expects to create heat conf' do
       it 'has domain override values' do
         node.set['openstack']['orchestration']['heat_stack_user_role'] = 'heat_stack_user'
         node.set['openstack']['orchestration']['stack_user_domain_name'] = 'heat'
+        node.set['openstack']['orchestration']['stack_user_domain_id'] = '123'
         node.set['openstack']['orchestration']['stack_domain_admin'] = 'heat_stack_admin'
         [
           /^heat_stack_user_role=heat_stack_user$/,
           /^stack_user_domain_name=heat$/,
+          /^stack_user_domain_id=123$/,
           /^stack_domain_admin=heat_stack_admin$/,
           /^stack_domain_admin_password=heat_stack_domain_admin_password$/
         ].each do |line|

templates/default/heat.conf.erb

@@ -116,8 +116,12 @@ heat_stack_user_role=<%= node['openstack']['orchestration']['heat_stack_user_rol
 # Keystone domain ID which contains heat template-defined
 # users. If this option is set, stack_user_domain_name option
 # will be ignored. (string value)
-# Deprecated group/name - [DEFAULT]/stack_user_domain
+# Deprecated group/name - [DEFAULT]/stack_user_domain_id
+<% if node['openstack']['orchestration']['stack_user_domain_id'] -%>
+stack_user_domain_id=<%= node['openstack']['orchestration']['stack_user_domain_id'] %>
+<% else -%>
 #stack_user_domain_id=<None>
+<% end -%>
 
 # Keystone domain name which contains heat template-defined
 # users. If `stack_user_domain_id` option is set, this option