[k8s] Adjust scenario for bionic

[fuel.git] / mcp / reclass / classes / cluster / mcp-k8s-calico-noha / infra / config.yml.j2

diff --git a/mcp/reclass/classes/cluster/mcp-k8s-calico-noha/infra/config.yml.j2 b/mcp/reclass/classes/cluster/mcp-k8s-calico-noha/infra/config.yml.j2
index d42d6e5..e3cd67b 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-k8s-calico-noha/infra/config.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-k8s-calico-noha/infra/config.yml.j2
@@ -29,6 +29,7 @@ parameters:
     # yamllint disable-line rule:line-length
     salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
     kubernetes_control_node01_deploy_address: ${_param:opnfv_openstack_control_node01_pxe_admin_address}
+    kubernetes_control_system_codename: bionic
   linux:
     system:
       user:
@@ -62,7 +63,7 @@ parameters:
   {%- set mgmt = nm.net_mgmt_hosts | length + nm.start_ip[nm.net_mgmt] + loop.index %}
   {%- set pub = nm.net_public_hosts | length + nm.start_ip[nm.net_public] + loop.index %}
   {%- set pri = nm.net_private_hosts | length + nm.start_ip[nm.net_private] + loop.index %}
-        openstack_compute_node{{ n }}:
+        kubernetes_compute_node{{ n }}:
           name: cmp{{ '%03d' | format(cmp) }}
           domain: ${_param:cluster_domain}
           classes:
@@ -74,5 +75,5 @@ parameters:
             tenant_address: {{ nm.net_private | ipnet_hostaddr(pri) }}
             external_address: {{ nm.net_public | ipnet_hostaddr(pub) }}
             salt_master_host: ${_param:reclass_config_master}
-            linux_system_codename: xenial
+            linux_system_codename: ${_param:kubernetes_control_system_codename}
 {%- endfor %}