Add noifupdown for all br-floating

[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 00f2408..dc28645 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
@@ -5,12 +5,10 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
+{%- import 'net_map.j2' as nm with context %}
 ---
 parameters:
   _param:
-
-    openstack_version: queens
-
     # openstack service addresses
 {%- if conf.MCP_VCP %}
     openstack_proxy_control_address: ${_param:opnfv_openstack_proxy_control_address}
@@ -63,19 +61,6 @@ parameters:
     openstack_telemetry_node03_address: ${_param:openstack_control_node03_address}
 {%- endif %}
 
-    # OpenStack Compute
-    openstack_compute_node01_single_address: ${_param:opnfv_openstack_compute_node01_single_address}
-    openstack_compute_node02_single_address: ${_param:opnfv_openstack_compute_node02_single_address}
-    openstack_compute_node03_single_address: ${_param:opnfv_openstack_compute_node03_single_address}
-    openstack_compute_node01_control_address: ${_param:opnfv_openstack_compute_node01_control_address}
-    openstack_compute_node02_control_address: ${_param:opnfv_openstack_compute_node02_control_address}
-    openstack_compute_node03_control_address: ${_param:opnfv_openstack_compute_node03_control_address}
-    openstack_compute_node01_tenant_address: ${_param:opnfv_openstack_compute_node01_tenant_address}
-    openstack_compute_node02_tenant_address: ${_param:opnfv_openstack_compute_node02_tenant_address}
-    openstack_compute_node03_tenant_address: ${_param:opnfv_openstack_compute_node03_tenant_address}
-    openstack_compute_node01_external_address: ${_param:opnfv_openstack_compute_node01_external_address}
-    openstack_compute_node02_external_address: ${_param:opnfv_openstack_compute_node02_external_address}
-
     # openstack service hostnames
 {%- if conf.MCP_VCP %}
     openstack_proxy_hostname: prx
@@ -135,6 +120,7 @@ parameters:
 
     openstack_region: RegionOne
     admin_email: root@localhost
+    db_connection_recycle_time: 300
     # Neutron osv/nodvr
     neutron_control_dvr: 'False'
     neutron_global_physnet_mtu: 1500
@@ -195,6 +181,14 @@ parameters:
     keystone_neutron_password: opnfv_secret
     keystone_nova_password: opnfv_secret
     keystone_designate_password: opnfv_secret
+
+    barbican_version: ${_param:openstack_version}
+    barbican_service_host: ${_param:openstack_control_address}
+    mysql_barbican_password: opnfv_secret
+    keystone_barbican_password: opnfv_secret
+    barbican_simple_crypto_kek: "YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXoxMjM0NTY="
+    barbican_integration_enabled: true
+
     ceilometer_secret_key: opnfv_secret
     horizon_version: ${_param:openstack_version}
     horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
@@ -204,7 +198,7 @@ parameters:
     metadata_password: opnfv_secret
     openstack_telemetry_keepalived_password: opnfv_secret
     aodh_service_host: ${_param:openstack_telemetry_address}
-    gnocchi_version: 4.0
+    gnocchi_version: 4.2
     gnocchi_service_host: ${_param:openstack_telemetry_address}
     mysql_gnocchi_password: opnfv_secret
     keystone_gnocchi_password: opnfv_secret
@@ -259,6 +253,20 @@ parameters:
           source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/${_param:openstack_version} main"
           key_id: EC4926EA
           key_server: keyserver.ubuntu.com
+          pin:
+            - pin: 'release o=Canonical'
+              priority: 1200
+              package: 'python-pymysql libvirt* *qemu*'
+{%- if 'aarch64' in nm.cluster.arch %}
+        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"
+          key_id: 798AB1D1
+          key_server: keys.gnupg.net
+          pin:
+            - pin: 'release a=${_param:openstack_version}-armband'
+              priority: 1201
+              package: '*'
+{%- endif %}
       kernel:
         sysctl:
           net.ipv4.tcp_congestion_control: yeah
@@ -387,13 +395,13 @@ parameters:
             - ${_param:openstack_control_node03_hostname}
             - ${_param:openstack_control_node03_hostname}.${_param:cluster_domain}
 {%- endif %}
-        cmp001:
-          address: ${_param:openstack_compute_node01_control_address}
-          names:
-            - ${_param:openstack_compute_node01_hostname}
-            - ${_param:openstack_compute_node01_hostname}.${_param:cluster_domain}
-        cmp002:
-          address: ${_param:openstack_compute_node02_control_address}
+{#- For compute nodes, expand values in-place, bypassing reclass param expansion #}
+{%- for cmp in range(1, nm.cmp_nodes + 1) %}
+  {%- set h = 'cmp%03d' | format(cmp) %}
+  {%- set mgmt = nm.net_mgmt_hosts | length + nm.start_ip[nm.net_mgmt] + loop.index %}
+        {{ h }}:
+          address: {{ nm.net_mgmt | ipnet_hostaddr(mgmt) }}
           names:
-            - ${_param:openstack_compute_node02_hostname}
-            - ${_param:openstack_compute_node02_hostname}.${_param:cluster_domain}
+            - {{ h }}
+            - {{ h }}.${_param:cluster_domain}
+{%- endfor %}