Merge "Add parameter to manage horizon's keystone_domain_choices"

deployment/horizon/horizon-container-puppet.yaml

@@ -121,11 +121,19 @@ parameters:
     description: Specifies a mapping from SSO authentication choice to identity
                  provider and protocol.  The identity provider and protocol names
                  must match the resources defined in keystone.
+  HorizonDomainChoices:
+    default: []
+    type: json
+    description: Specifies available domains to choose from. We expect an array
+                 of hashes, and the hashes should have two items each (name, display)
+                 containing Keystone domain name and a human-readable description of
+                 the domain respectively.
 
 conditions:
   debug_unset: {equals : [{get_param: Debug}, '']}
   websso_enabled: {equals : [{get_param: WebSSOEnable}, True]}
   internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
+  horizon_domain_choices_set: {not: {equals: [{get_param: HorizonDomainChoices}, []]}}
 
 resources:
 
@@ -200,6 +208,10 @@ outputs:
           - debug_unset
           - horizon::django_debug: { get_param: HorizonDebug }
           - horizon::django_debug: { get_param: Debug }
+        - if:
+          - horizon_domain_choices_set
+          - horizon::keystone_domain_choices: {get_param: HorizonDomainChoices}
+          - {}
       ansible_group_vars:
         keystone_enable_member: true
       # BEGIN DOCKER SETTINGS