commit cf2379b11128059dc4b11d03f5f33a50ebe721c0
author mcp-jenkins <mcp-jenkins@mirantis.com> Tue Mar 26 13:30:07 2019 +0000
committer Gerrit Code Review <mail@domain.com> Tue Mar 26 13:30:07 2019 +0000
tree dc75574258356b1171b8b820bf26ef705b50816d
parent 3c4e4c934254a301161273da17220cf589eed893
parent 6dbab88f2aed3cdefaac9a1816a44fb692dd6c42

Merge "Removing heat:server:stack_domain_admin:domain" into release/2019.2.0

heat/server/cluster.yml

diff --git a/heat/server/cluster.yml b/heat/server/cluster.yml
index 1edf790..be2f211 100644
--- a/heat/server/cluster.yml
+++ b/heat/server/cluster.yml
@@ -18,7 +18,6 @@
       stack_domain_admin:
         name: heat_domain_admin
         password: ${_param:heat_domain_admin_password}
-        domain: heat
       enabled: true
       region: ${_param:openstack_region}
       version: ${_param:heat_version}

heat/server/single.yml

diff --git a/heat/server/single.yml b/heat/server/single.yml
index 24db595..4ce11fa 100644
--- a/heat/server/single.yml
+++ b/heat/server/single.yml
@@ -17,7 +17,6 @@
       stack_domain_admin:
         name: heat_domain_admin
         password: ${_param:heat_domain_admin_password}
-        domain: heat
       metadata:
         protocol: ${_param:cluster_public_protocol}
       waitcondition: