X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Freclass%2Fclasses%2Fcluster%2Fmcp-common-ha%2Fopenstack_init.yml.j2;h=a327919c5fefb18f7a7829464d0f41b36e20c7e9;hb=0e56195965eea0ecaaeedcf668e58eb75d0c1631;hp=b08837876b654997bfcadfe8ae40dd480bea4c4f;hpb=9857a8101115487a0e1d460ad8f774b93fef334d;p=fuel.git

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 b08837876..a327919c5 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2
@@ -7,8 +7,6 @@
 ##############################################################################
 {%- import 'net_map.j2' as nm with context %}
 ---
-classes:
-  - cluster.all-mcp-arch-common.uca_repo
 parameters:
   _param:
     # openstack service addresses
@@ -110,16 +108,6 @@ parameters:
     openstack_compute_node01_hostname: cmp001
     openstack_compute_node02_hostname: cmp002
 
-    # opendaylight options
-{%- if conf.MCP_VCP %}
-    opendaylight_server_node01_hostname: odl01
-    opendaylight_server_node01_single_address: ${_param:opnfv_opendaylight_server_node01_single_address}
-{%- else %}
-    opendaylight_control_hostname: ${_param:openstack_control_node02_hostname}
-    opendaylight_server_node01_hostname: ${_param:opendaylight_control_hostname}
-    opendaylight_server_node01_single_address: ${_param:opnfv_openstack_control_node02_address}
-{%- endif %}
-
     openstack_region: RegionOne
     admin_email: root@localhost
     db_connection_recycle_time: 300
@@ -153,6 +141,7 @@ parameters:
     glusterfs_service_host: ${_param:openstack_control_address}
 {%- endif %}
     mysql_admin_user: root
+    aodh_version: ${_param:openstack_version}
     barbican_version: ${_param:openstack_version}
     barbican_service_host: ${_param:openstack_control_address}
     barbican_integration_enabled: true
@@ -161,7 +150,7 @@ parameters:
     horizon_identity_encryption: none
     horizon_identity_version: 3
     aodh_service_host: ${_param:openstack_telemetry_address}
-    gnocchi_version: 4.2
+    gnocchi_version: 4.3
     gnocchi_service_host: ${_param:openstack_telemetry_address}
     panko_version: ${_param:openstack_version}
     panko_service_host: ${_param:openstack_telemetry_address}
@@ -206,18 +195,13 @@ parameters:
     # billometer_identity_token: ${_param:keystone_service_token}
   linux:
     system:
-      repo:
-        uca:
-          pin:
-            - pin: 'release o=Canonical'
-              priority: 1200
-              package: 'libvirt* qemu* openvswitch* python-openvswitch ovn* dpdk* libdpdk*'
 {%- 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:openstack_version}/${_param:linux_system_codename} ${_param:openstack_version}-armband main"
+          source: "deb http://linux.enea.com/mcp-repos/${_param:armband_repo_version}/${_param:linux_system_codename} ${_param:armband_repo_version}-armband main"
           key: ${_param:armband_key}
           pin:
-            - pin: 'release a=${_param:openstack_version}-armband'
+            - pin: 'release a=${_param:armband_repo_version}-armband'
               priority: 1201
               package: '*'
 {%- endif %}