Merge "Added gainsight related docker container in monitoring LMA"
diff --git a/jenkins/client/job/oscore/cookiecutter.yml b/jenkins/client/job/oscore/cookiecutter.yml
index f38609a..bc180b4 100644
--- a/jenkins/client/job/oscore/cookiecutter.yml
+++ b/jenkins/client/job/oscore/cookiecutter.yml
@@ -66,7 +66,6 @@
cookiecutter_template_branch: 'master'
shared_reclass_url: https://gerrit.mcp.mirantis.net/salt-models/reclass-system.git
shared_reclass_branch: 'master'
- openstack_version: pike
STACK_INSTALL:
type: string
default: 'core,openstack,ovs'
diff --git a/kubernetes/master/cluster.yml b/kubernetes/master/cluster.yml
index 78ff659..6d6b404 100644
--- a/kubernetes/master/cluster.yml
+++ b/kubernetes/master/cluster.yml
@@ -9,8 +9,13 @@
kubernetes_netchecker_server_repo: mirantis
kubernetes_netchecker_agent_image: ${_param:kubernetes_netchecker_agent_repo}/k8s-netchecker-agent:v1.2.2
kubernetes_netchecker_server_image: ${_param:kubernetes_netchecker_server_repo}/k8s-netchecker-server:v1.2.2
+
+ kubelet_fail_on_swap: true
+
kubernetes:
master:
+ kubelet:
+ fail_on_swap: ${_param:kubelet_fail_on_swap}
container: false
network:
calico:
diff --git a/kubernetes/master/single.yml b/kubernetes/master/single.yml
index 7fada57..b4f20b0 100644
--- a/kubernetes/master/single.yml
+++ b/kubernetes/master/single.yml
@@ -6,6 +6,11 @@
kubernetes_netchecker_server_repo: mirantis
kubernetes_netchecker_agent_image: ${_param:kubernetes_netchecker_agent_repo}/k8s-netchecker-agent:v1.2.2
kubernetes_netchecker_server_image: ${_param:kubernetes_netchecker_server_repo}/k8s-netchecker-server:v1.2.2
+
+ kubelet_fail_on_swap: true
+
kubernetes:
master:
+ kubelet:
+ fail_on_swap: ${_param:kubelet_fail_on_swap}
container: false
diff --git a/kubernetes/pool/cluster.yml b/kubernetes/pool/cluster.yml
index dee1954..335078f 100644
--- a/kubernetes/pool/cluster.yml
+++ b/kubernetes/pool/cluster.yml
@@ -22,12 +22,16 @@
kubernetes_criproxy_version: v0.11.0
kubernetes_criproxy_checksum: md5=115bbb0c27518db6b0b3bc8cdc5fc897
+ kubelet_fail_on_swap: true
+
kubernetes:
common:
hyperkube:
image: ${_param:kubernetes_hyperkube_image}
pause_image: ${_param:kubernetes_pause_image}
pool:
+ kubelet:
+ fail_on_swap: ${_param:kubelet_fail_on_swap}
container: false
network:
calico:
diff --git a/kubernetes/pool/single.yml b/kubernetes/pool/single.yml
index 36ceba1..3f4af34 100644
--- a/kubernetes/pool/single.yml
+++ b/kubernetes/pool/single.yml
@@ -22,12 +22,16 @@
kubernetes_criproxy_version: v0.11.0
kubernetes_criproxy_checksum: md5=115bbb0c27518db6b0b3bc8cdc5fc897
+ kubelet_fail_on_swap: true
+
kubernetes:
common:
hyperkube:
image: ${_param:kubernetes_hyperkube_image}
pause_image: ${_param:kubernetes_pause_image}
pool:
+ kubelet:
+ fail_on_swap: ${_param:kubelet_fail_on_swap}
container: false
docker:
host:
diff --git a/reclass/storage/system/kubernetes_proxy_cluster.yml b/reclass/storage/system/kubernetes_proxy_cluster.yml
new file mode 100644
index 0000000..b00c254
--- /dev/null
+++ b/reclass/storage/system/kubernetes_proxy_cluster.yml
@@ -0,0 +1,28 @@
+parameters:
+ _param:
+ kubernetes_proxy_node01_hostname: prx01
+ kubernetes_proxy_node02_hostname: prx02
+ kubernetes_proxy_system_codename: xenial
+ reclass:
+ storage:
+ node:
+ kubernetes_proxy_node01:
+ name: ${_param:kubernetes_proxy_node01_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.kubernetes.proxy
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: ${_param:kubernetes_proxy_system_codename}
+ single_address: ${_param:kubernetes_proxy_node01_address}
+ keepalived_vip_priority: 102
+ kubernetes_proxy_node02:
+ name: ${_param:kubernetes_proxy_node02_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.kubernetes.proxy
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: ${_param:kubernetes_proxy_system_codename}
+ single_address: ${_param:kubernetes_proxy_node02_address}
+ keepalived_vip_priority: 101
diff --git a/salt/control/cluster/kubernetes_proxy_cluster.yml b/salt/control/cluster/kubernetes_proxy_cluster.yml
new file mode 100644
index 0000000..d4251a2
--- /dev/null
+++ b/salt/control/cluster/kubernetes_proxy_cluster.yml
@@ -0,0 +1,25 @@
+parameters:
+ salt:
+ control:
+ size:
+ kubernetes.proxy:
+ cpu: 32
+ ram: 65536
+ disk_profile: small
+ net_profile: default
+ cluster:
+ internal:
+ domain: ${_param:cluster_domain}
+ engine: virt
+ node:
+ prx01:
+ name: ${_param:kubernetes_proxy_node01_hostname}
+ provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+ image: ${_param:salt_control_trusty_image}
+ size: kubernetes.proxy
+ prx02:
+ name: ${_param:kubernetes_proxy_node02_hostname}
+ provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+ image: ${_param:salt_control_trusty_image}
+ size: kubernetes.proxy
+