Merge "Fix proxy model"
diff --git a/classes/cluster/k8s_ha_calico/infra/config.yml b/classes/cluster/k8s_ha_calico/infra/config.yml
index 1eb842b..0d9f4ea 100644
--- a/classes/cluster/k8s_ha_calico/infra/config.yml
+++ b/classes/cluster/k8s_ha_calico/infra/config.yml
@@ -23,6 +23,14 @@
reactor:
reclass/minion/classify:
- salt://reclass/reactor/node_register.sls
+ environment:
+ # TODO: remove formulas in development once they are stable and part of shared the system-level reclass
+ dev:
+ formula:
+ helm:
+ source: git
+ address: '${_param:salt_master_environment_repository}/salt-formula-helm.git'
+ revision: ${_param:salt_master_environment_revision}
reclass:
storage:
class_mapping:
diff --git a/classes/cluster/k8s_ha_calico/infra/init.yml b/classes/cluster/k8s_ha_calico/infra/init.yml
index 3220d0e..62922ee 100644
--- a/classes/cluster/k8s_ha_calico/infra/init.yml
+++ b/classes/cluster/k8s_ha_calico/infra/init.yml
@@ -3,10 +3,7 @@
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.ubuntu
-- system.openssh.server.team.lab
-- system.openssh.server.team.tcpcloud
-- system.openssh.server.team.mcp_qa
-- system.openssh.server.team.k8s_team
+- system.openssh.server.team.all
parameters:
_param:
# infra service addresses
diff --git a/classes/cluster/k8s_ha_calico/kubernetes/control.yml b/classes/cluster/k8s_ha_calico/kubernetes/control.yml
index d438c5a..c6dd6ab 100644
--- a/classes/cluster/k8s_ha_calico/kubernetes/control.yml
+++ b/classes/cluster/k8s_ha_calico/kubernetes/control.yml
@@ -6,10 +6,24 @@
- system.kubernetes.master.cluster
- cluster.k8s_ha_calico.kubernetes.compute
- cluster.k8s_ha_calico
+# FIXME: replace service.helm to system.helm (once properly in reclass)
+- service.helm.client
parameters:
_param:
keepalived_vip_interface: ${_param:primary_interface}
keepalived_vip_virtual_router_id: 60
+ helm:
+ client:
+ repos:
+ mirantisworkloads: https://mirantisworkloads.storage.googleapis.com/
+ #releases:
+ # TODO: configure custom application stacks below
+ # grafana:
+ # chart: mirantisworkloads/grafana
+ # version: 0.4.1
+ # values:
+ # replicas: 1
+ # logLevel: INFO
etcd:
server:
source:
@@ -26,7 +40,7 @@
netchecker:
enabled: true
helm:
- enabled: true
+ enabled: false
master:
etcd:
ssl:
diff --git a/classes/cluster/k8s_ha_calico/kubernetes/init.yml b/classes/cluster/k8s_ha_calico/kubernetes/init.yml
index 307ebd0..1c4dfda 100644
--- a/classes/cluster/k8s_ha_calico/kubernetes/init.yml
+++ b/classes/cluster/k8s_ha_calico/kubernetes/init.yml
@@ -21,13 +21,9 @@
kubernetes_control_node01_hostname: ctl01
kubernetes_control_node02_hostname: ctl02
kubernetes_control_node03_hostname: ctl03
- kubernetes_compute_node01_hostname: cmp01
- kubernetes_compute_node02_hostname: cmp02
kubernetes_control_node01_address: 172.16.10.101
kubernetes_control_node02_address: 172.16.10.102
kubernetes_control_node03_address: 172.16.10.103
- kubernetes_compute_node01_address: 172.16.10.105
- kubernetes_compute_node02_address: 172.16.10.106
kubernetes_proxy_node01_hostname: prx01
kubernetes_proxy_node01_address: 172.16.10.121
@@ -72,21 +68,21 @@
names:
- ${_param:kubernetes_control_node03_hostname}
- ${_param:kubernetes_control_node03_hostname}.${_param:cluster_domain}
- cmp01:
- address: ${_param:kubernetes_compute_node01_address}
- names:
- - ${_param:kubernetes_compute_node01_hostname}
- - ${_param:kubernetes_compute_node01_hostname}.${_param:cluster_domain}
- cmp02:
- address: ${_param:kubernetes_compute_node02_address}
- names:
- - ${_param:kubernetes_compute_node02_hostname}
- - ${_param:kubernetes_compute_node02_hostname}.${_param:cluster_domain}
prx01:
address: ${_param:kubernetes_proxy_node01_address}
names:
- ${_param:kubernetes_proxy_node01_hostname}
- ${_param:kubernetes_proxy_node01_hostname}.${_param:cluster_domain}
+ linux:
+ network:
+ interface:
+ primary_interface:
+ route:
+ # TODO: Remove comment.
+ # Will work once CI has this in linux formula (packaged): https://gerrit.mcp.mirantis.net/#/c/8952
+ kubernetes_internal:
+ address: 10.254.0.0
+ netmask: 255.255.0.0
system:
rc:
local: |
@@ -99,5 +95,4 @@
# Make sure that the script will "exit 0" on success or any other
# value on error.
#
- ip r a 10.254.0.0/16 dev ens3
exit 0
diff --git a/classes/cluster/os_aio_contrail/openstack/init.yml b/classes/cluster/os_aio_contrail/openstack/init.yml
index b3a0672..721257a 100755
--- a/classes/cluster/os_aio_contrail/openstack/init.yml
+++ b/classes/cluster/os_aio_contrail/openstack/init.yml
@@ -96,43 +96,8 @@
linux:
network:
host:
- ctl:
- address: ${_param:openstack_control_address}
- names:
- - ctl
- - ctl.${_param:cluster_domain}
ctl01:
address: ${_param:openstack_control_node01_address}
names:
- ${_param:openstack_control_node01_hostname}
- ${_param:openstack_control_node01_hostname}.${_param:cluster_domain}
- msg:
- address: ${_param:openstack_message_queue_address}
- names:
- - msg
- - msg.${_param:cluster_domain}
- msg01:
- address: ${_param:openstack_message_queue_node01_address}
- names:
- - ${_param:openstack_message_queue_node01_hostname}
- - ${_param:openstack_message_queue_node01_hostname}.${_param:cluster_domain}
- dbs:
- address: ${_param:openstack_database_address}
- names:
- - dbs
- - dbs.${_param:cluster_domain}
- dbs01:
- address: ${_param:openstack_database_node01_address}
- names:
- - ${_param:openstack_database_node01_hostname}
- - ${_param:openstack_database_node01_hostname}.${_param:cluster_domain}
- cmp01:
- address: ${_param:openstack_compute_node01_address}
- names:
- - ${_param:openstack_compute_node01_hostname}
- - ${_param:openstack_compute_node01_hostname}.${_param:cluster_domain}
- cmp02:
- address: ${_param:openstack_compute_node02_address}
- names:
- - ${_param:openstack_compute_node02_hostname}
- - ${_param:openstack_compute_node02_hostname}.${_param:cluster_domain}
diff --git a/classes/system b/classes/system
index dd3848d..9b85a38 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit dd3848d8bd94040044f2c5fa1724640c56195333
+Subproject commit 9b85a38800599124dfe4118d9bb007eee52b6932