aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2019-07-31 13:32:01 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2019-08-02 10:05:46 +0400
commit2a04ab183da19c7058f8332e214d5124ef97379d (patch)
treec72a52c5f26d06f0e5d36ec292ebfeeaa533104e
parent4b3be4c5f4b3ba13ec6f5dc8708c9e91b1cb4ace (diff)
[k8s] Adjust scenario for bionic
Change-Id: I5c7a1e827446189b98b924ffd4272acf1a794697 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
-rw-r--r--mcp/reclass/classes/cluster/mcp-k8s-calico-noha/infra/config.yml.j25
-rw-r--r--mcp/reclass/classes/cluster/mcp-k8s-calico-noha/kubernetes/common.yml.j27
m---------mcp/salt-formulas/salt-formula-etcd0
m---------mcp/salt-formulas/salt-formula-kubernetes0
4 files changed, 6 insertions, 6 deletions
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 d42d6e5f9..e3cd67bdf 100644
--- 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 %}
diff --git a/mcp/reclass/classes/cluster/mcp-k8s-calico-noha/kubernetes/common.yml.j2 b/mcp/reclass/classes/cluster/mcp-k8s-calico-noha/kubernetes/common.yml.j2
index 4367d318c..bd6e48fce 100644
--- a/mcp/reclass/classes/cluster/mcp-k8s-calico-noha/kubernetes/common.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-k8s-calico-noha/kubernetes/common.yml.j2
@@ -8,15 +8,14 @@
{%- import 'net_map.j2' as nm with context %}
---
classes:
- - system.linux.system.repo.mcp.apt_mirantis.docker
- - system.linux.system.repo.mcp.apt_mirantis.update.docker
- - system.linux.system.repo.mcp.apt_mirantis.kubernetes_extra
- - system.linux.system.repo.mcp.apt_mirantis.update.kubernetes_extra
- system.kubernetes.pool.single
- system.salt.minion.cert.k8s_client_single
- system.salt.minion.cert.etcd_client_single
+ - cluster.all-mcp-arch-common.backports
- cluster.mcp-common-noha.openstack_compute_pdf
parameters:
+ _param:
+ kubernetes_containerd_package: containerd
kubernetes:
common:
hyperkube:
diff --git a/mcp/salt-formulas/salt-formula-etcd b/mcp/salt-formulas/salt-formula-etcd
-Subproject 8c7649df03e73b18781a19592584faf56b3000d
+Subproject b0c13fc3701045df3587d74d37bd947fd84dfda
diff --git a/mcp/salt-formulas/salt-formula-kubernetes b/mcp/salt-formulas/salt-formula-kubernetes
-Subproject 7a472de71ee6958660bf58539fac214cf332862
+Subproject ffa16d06db002139aca3856b26539e54f17ed6d