Merge "[noha] baremetal: Fix undef armband_repo_version"

diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
index 0770f5c..9e862fe 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
@@ -117,6 +117,8 @@ parameters:
         host: ${_param:openstack_proxy_control_address}
         port: 8003
         protocol: http
+      stack_domain_admin:
+        domain: heat_user_domain
 {%- else %}
   libvirt:
     server:

diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
index d36d583..e1ae1e0 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
@@ -147,6 +147,8 @@ parameters:
           address: ${_param:single_address}
         api_cloudwatch:
           address: ${_param:single_address}
+      stack_domain_admin:
+        domain: heat_user_domain
   mysql:
     server:
       version: '5.7'

diff --git a/mcp/scripts/pharos b/mcp/scripts/pharos
index 01c376d..7aa3b0d 160000 (submodule)
--- a/mcp/scripts/pharos
+++ b/mcp/scripts/pharos
@@ -1 +1 @@
-Subproject commit 01c376d1f9463b4f1c73093e97bd98969118edbb
+Subproject commit 7aa3b0d59d9b0e2935f4eedd78efb7467b29cae2