X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Freclass%2Fclasses%2Fcluster%2Fmcp-common-noha%2Fopenstack_init.yml.j2;h=de54136a6d4beed695bbecb76cd5d22d2a0d8a56;hb=7522bdb0e898144da2b6dc361dbdd549b39bc025;hp=5aae27c415ea919b5a05b1596e3d736e1b188878;hpb=f172f8e3dc92710f79a33ad38aa3da6313da879c;p=fuel.git

diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2
index 5aae27c41..de54136a6 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2
@@ -24,8 +24,6 @@ parameters:
     neutron_compute_agent_mode: legacy
     neutron_compute_external_access: 'False'
     galera_server_cluster_name: openstack_cluster
-    galera_server_maintenance_password: opnfv_secret
-    galera_server_admin_password: opnfv_secret
     cluster_vip_address: ${_param:cluster_public_host}
     cluster_local_address: ${_param:openstack_control_address}
     cluster_node01_hostname: ctl01
@@ -34,17 +32,12 @@ parameters:
     cluster_node02_address: ${_param:opnfv_openstack_control_node02_address}
     cluster_node03_hostname: ctl03
     cluster_node03_address: ${_param:opnfv_openstack_control_node03_address}
-    rabbitmq_secret_key: opnfv_secret
-    rabbitmq_admin_password: opnfv_secret
-    rabbitmq_openstack_password: opnfv_secret
-    rabbitmq_cold_password: opnfv_secret
     glance_version: ${_param:openstack_version}
     glance_service_host: ${_param:cluster_local_address}
     keystone_version: ${_param:openstack_version}
     keystone_service_host: ${_param:cluster_local_address}
     heat_version: ${_param:openstack_version}
     heat_service_host: ${_param:cluster_local_address}
-    heat_domain_admin_password: opnfv_secret
     ceilometer_version: ${_param:openstack_version}
     ceilometer_service_host: ${_param:cluster_local_address}
     ceilometer_database_host: ${_param:cluster_local_address}
@@ -56,27 +49,6 @@ parameters:
     neutron_version: ${_param:openstack_version}
     neutron_service_host: ${_param:cluster_local_address}
     mysql_admin_user: root
-    mysql_admin_password: opnfv_secret
-    mysql_cinder_password: opnfv_secret
-    mysql_ceilometer_password: opnfv_secret
-    mysql_glance_password: opnfv_secret
-    mysql_grafana_password: opnfv_secret
-    mysql_heat_password: opnfv_secret
-    mysql_keystone_password: opnfv_secret
-    mysql_neutron_password: opnfv_secret
-    mysql_nova_password: opnfv_secret
-    mysql_aodh_password: opnfv_secret
-    keystone_service_token: opnfv_secret
-    keystone_admin_password: opnfv_secret
-    keystone_ceilometer_password: opnfv_secret
-    keystone_cinder_password: opnfv_secret
-    keystone_glance_password: opnfv_secret
-    keystone_heat_password: opnfv_secret
-    keystone_keystone_password: opnfv_secret
-    keystone_neutron_password: opnfv_secret
-    keystone_nova_password: opnfv_secret
-    ceilometer_secret_key: opnfv_secret
-    metadata_password: opnfv_secret
     horizon_version: ${_param:openstack_version}
     horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
     horizon_identity_host: ${_param:cluster_vip_address}
@@ -86,28 +58,19 @@ parameters:
     barbican_version: ${_param:openstack_version}
     barbican_service_host: ${_param:cluster_local_address}
     apache_barbican_api_address: ${_param:single_address}
-    mysql_barbican_password: opnfv_secret
-    keystone_barbican_password: opnfv_secret
     barbican_simple_crypto_kek: "YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXoxMjM0NTY="
     barbican_integration_enabled: true
 
 {%- if '-sfc-' in conf.MCP_DEPLOY_SCENARIO %}
     tacker_service_host: ${_param:cluster_local_address}
-    keystone_tacker_password: opnfv_secret
-    mysql_tacker_password: opnfv_secret
 {%- endif %}
 
     aodh_version: ${_param:openstack_version}
-    keystone_aodh_password: opnfv_secret
     aodh_service_host: ${_param:cluster_local_address}
-    gnocchi_version: 4.2
+    gnocchi_version: 4.3
     gnocchi_service_host: ${_param:cluster_local_address}
-    mysql_gnocchi_password: opnfv_secret
-    keystone_gnocchi_password: opnfv_secret
     panko_version: ${_param:openstack_version}
     panko_service_host: ${_param:cluster_local_address}
-    mysql_panko_password: opnfv_secret
-    keystone_panko_password: opnfv_secret
     ceilometer_agent_default_polling_interval: 180
     ceilometer_agent_default_polling_meters:
       - "*"
@@ -118,15 +81,16 @@ parameters:
           net.ipv4.tcp_congestion_control: yeah
           net.ipv4.tcp_slow_start_after_idle: 0
           net.ipv4.tcp_fin_timeout: 30
+{%- if 'aarch64' in nm.cluster.arch %}
       repo:
-        uca:
-          source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/${_param:openstack_version} main"
-          key_id: EC4926EA
-          key_server: keyserver.ubuntu.com
+        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"
+          key: ${_param:armband_key}
           pin:
-            - pin: 'release o=Canonical'
-              priority: 1200
-              package: 'openvswitch* python-openvswitch ovn* dpdk* libdpdk*'
+            - pin: 'release a=${_param:armband_repo_version}-armband'
+              priority: 1201
+              package: '*'
+{%- endif %}
     network:
       host:
         ctl: