[baremetal] Stein, Bionic, py3 support

[fuel.git] / mcp / reclass / classes / cluster / mcp-common-ha / openstack_init.yml.j2

diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2
index c3f90bc..bdc23ff 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2
@@ -144,6 +144,7 @@ parameters:
     aodh_version: ${_param:openstack_version}
     barbican_version: ${_param:openstack_version}
     barbican_service_host: ${_param:openstack_control_address}
+    apache_barbican_api_address: ${_param:single_address}
     barbican_integration_enabled: true
     horizon_version: ${_param:openstack_version}
     horizon_identity_host: ${_param:openstack_control_address}
@@ -200,11 +201,11 @@ parameters:
 {%- if 'aarch64' in nm.cluster.arch %}
       repo:
         armband_3:  # Should be in sync with the repo config generated via curtin/MaaS
-          source: "deb http://linux.enea.com/mcp-repos/${_param:armband_repo_version}/${_param:linux_system_codename} ${_param:armband_repo_version}-armband main"
+          source: "deb http://linux.enea.com/mcp-repos/${_param:armband_repo_version}/xenial ${_param:armband_repo_version}-armband main"
           key: ${_param:armband_key}
           pin:
             - pin: 'release a=${_param:armband_repo_version}-armband'
-              priority: 1201
+              priority: 15
               package: '*'
 {%- endif %}
       kernel: