Merge "Removed helm from k8s-ha-calico."
diff --git a/.kitchen.yml b/.kitchen.yml
index f66b6bf..a8c4051 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -29,7 +29,7 @@
export BOOTSTRAP=1;\n
export CLUSTER_NAME=<%= cluster %>;\n
export FORMULAS_SOURCE=pkg;\n
- export RECLASS_VERSION=develop;\n
+ export RECLASS_VERSION=master;\n
export RECLASS_IGNORE_CLASS_NOTFOUND=True;\n
export RECLASS_IGNORE_CLASS_REGEXP='service.*';\n
export EXTRA_FORMULAS="";\n
diff --git a/classes/cluster/aaa-ha-freeipa/aaa/freeipa_server.yml b/classes/cluster/aaa-ha-freeipa/aaa/freeipa_server.yml
index ebf3496..33c8a6e 100644
--- a/classes/cluster/aaa-ha-freeipa/aaa/freeipa_server.yml
+++ b/classes/cluster/aaa-ha-freeipa/aaa/freeipa_server.yml
@@ -4,7 +4,7 @@
#- system.haproxy.proxy.listen.
#- system.salt.minion.cert.
- system.mysql.client
-- system.freeipa.server.cluster
+#- system.freeipa.server.cluster
- cluster.aaa-ha-freeipa.aaa
parameters:
_param:
@@ -18,6 +18,7 @@
mysql_admin_password: password
freeipa_principal_user: principal
freeipa_dns_zone: aaa-freeipa.local
+ freeipa_realm: ${_param:cluster_domain}
freeipa:
server:
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
index a73a57b..ea131dd 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
@@ -18,6 +18,7 @@
pool:
kubelet:
address: ${_param:single_address}
+ fail_on_swap: ${_param:kubelet_fail_on_swap}
network:
etcd:
ssl:
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/control.yml b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
index 11bd2e5..23d4da7 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
@@ -54,6 +54,7 @@
master:
kubelet:
address: ${_param:single_address}
+ fail_on_swap: ${_param:kubelet_fail_on_swap}
etcd:
ssl:
enabled: true
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/init.yml b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
index c669373..1336dde 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
@@ -3,6 +3,9 @@
salt_minion_ca_host: ${_param:infra_config_hostname}.${_param:cluster_domain}
salt_minion_ca_authority: salt_master_ca
+ # kubelet
+ kubelet_fail_on_swap: True
+
# kubernetes settings
kubernetes_admin_user: admin
kubernetes_admin_password: sbPfel23ZigJF3Bm
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml b/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
index e3b8396..1b51aa8 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
@@ -36,6 +36,7 @@
pool:
kubelet:
address: ${_param:single_address}
+ fail_on_swap: ${_param:kubelet_fail_on_swap}
network:
engine: opencontrail
config:
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/control.yml b/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
index 08760e2..012a0d0 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
@@ -54,6 +54,7 @@
master:
kubelet:
address: ${_param:single_address}
+ fail_on_swap: ${_param:kubelet_fail_on_swap}
etcd:
ssl:
enabled: true
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
index 822401b..ec8e4de 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
@@ -4,6 +4,9 @@
salt_minion_ca_host: ${_param:infra_config_hostname}.${_param:cluster_domain}
salt_minion_ca_authority: salt_master_ca
+ # kubelet
+ kubelet_fail_on_swap: True
+
# kubernetes settings
kubernetes_admin_user: admin
kubernetes_admin_password: sbPfel23ZigJF3Bm
diff --git a/classes/cluster/os-ha-contrail-40/opencontrail/init.yml b/classes/cluster/os-ha-contrail-40/opencontrail/init.yml
index ad22679..750dbc0 100644
--- a/classes/cluster/os-ha-contrail-40/opencontrail/init.yml
+++ b/classes/cluster/os-ha-contrail-40/opencontrail/init.yml
@@ -1,6 +1,6 @@
parameters:
_param:
- opencontrail_analytics_address: ${_param:openstack_control_address}
+ opencontrail_analytics_address: ${_param:opencontrail_control_address}
opencontrail_analytics_node01_address: ${_param:openstack_control_node01_address}
opencontrail_analytics_node02_address: ${_param:openstack_control_node02_address}
opencontrail_analytics_node03_address: ${_param:openstack_control_node03_address}
diff --git a/classes/cluster/os-ha-contrail-40/openstack/init.yml b/classes/cluster/os-ha-contrail-40/openstack/init.yml
index cdcfd10..6ecca65 100644
--- a/classes/cluster/os-ha-contrail-40/openstack/init.yml
+++ b/classes/cluster/os-ha-contrail-40/openstack/init.yml
@@ -29,8 +29,8 @@
openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
- openstack_compute_node01_hostname: cmp01
- openstack_compute_node02_hostname: cmp02
+ openstack_compute_node01_hostname: cmp0
+ openstack_compute_node02_hostname: cmp1
openstack_compute_node01_address: 172.16.10.105
openstack_compute_node02_address: 172.16.10.106
diff --git a/classes/cluster/os-ha-contrail-ironic/opencontrail/init.yml b/classes/cluster/os-ha-contrail-ironic/opencontrail/init.yml
index 7e1e78c..8223a11 100644
--- a/classes/cluster/os-ha-contrail-ironic/opencontrail/init.yml
+++ b/classes/cluster/os-ha-contrail-ironic/opencontrail/init.yml
@@ -1,6 +1,6 @@
parameters:
_param:
- opencontrail_analytics_address: ${_param:openstack_control_address}
+ opencontrail_analytics_address: ${_param:opencontrail_control_address}
opencontrail_analytics_node01_address: ${_param:openstack_control_node01_address}
opencontrail_analytics_node02_address: ${_param:openstack_control_node02_address}
opencontrail_analytics_node03_address: ${_param:openstack_control_node03_address}
diff --git a/classes/cluster/os-ha-contrail-ironic/openstack/init.yml b/classes/cluster/os-ha-contrail-ironic/openstack/init.yml
index 0b312e1..9e2222f 100755
--- a/classes/cluster/os-ha-contrail-ironic/openstack/init.yml
+++ b/classes/cluster/os-ha-contrail-ironic/openstack/init.yml
@@ -29,8 +29,8 @@
openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
- openstack_compute_node01_hostname: cmp01
- openstack_compute_node02_hostname: cmp02
+ openstack_compute_node01_hostname: cmp0
+ openstack_compute_node02_hostname: cmp1
openstack_compute_node01_address: 172.16.10.105
openstack_compute_node02_address: 172.16.10.106
diff --git a/classes/cluster/os-ha-contrail/infra/config.yml b/classes/cluster/os-ha-contrail/infra/config.yml
index 5eb19c7..2b04e1f 100755
--- a/classes/cluster/os-ha-contrail/infra/config.yml
+++ b/classes/cluster/os-ha-contrail/infra/config.yml
@@ -97,6 +97,11 @@
value_template: <<node_os>>
salt_master_host:
value_template: <<node_master_ip>>
+ mark_contrail_version:
+ expression: <<opencontrail_version>>__startswith__oc
+ cluster_param:
+ linux_repo_contrail_component:
+ value_template: <<opencontrail_version>>
infra_config:
expression: <<node_hostname>>__startswith__cfg
cluster_param:
@@ -106,8 +111,6 @@
value_template: <<node_deploy_ip>>
cluster_domain:
value_template: <<node_domain>>
- linux_repo_contrail_component:
- value_template: <<opencontrail_version>>
openstack_control01:
expression: <<node_hostname>>__equals__ctl01
cluster_param:
diff --git a/classes/cluster/os-ha-contrail/opencontrail/init.yml b/classes/cluster/os-ha-contrail/opencontrail/init.yml
index fea67dd..4462a20 100644
--- a/classes/cluster/os-ha-contrail/opencontrail/init.yml
+++ b/classes/cluster/os-ha-contrail/opencontrail/init.yml
@@ -1,6 +1,6 @@
parameters:
_param:
- opencontrail_analytics_address: ${_param:openstack_control_address}
+ opencontrail_analytics_address: ${_param:opencontrail_control_address}
opencontrail_analytics_node01_address: ${_param:openstack_control_node01_address}
opencontrail_analytics_node02_address: ${_param:openstack_control_node02_address}
opencontrail_analytics_node03_address: ${_param:openstack_control_node03_address}
diff --git a/classes/cluster/os-ha-contrail/openstack/init.yml b/classes/cluster/os-ha-contrail/openstack/init.yml
index a17a62b..011c39c 100755
--- a/classes/cluster/os-ha-contrail/openstack/init.yml
+++ b/classes/cluster/os-ha-contrail/openstack/init.yml
@@ -29,8 +29,8 @@
openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
- openstack_compute_node01_hostname: cmp01
- openstack_compute_node02_hostname: cmp02
+ openstack_compute_node01_hostname: cmp0
+ openstack_compute_node02_hostname: cmp1
openstack_compute_node01_address: 172.16.10.105
openstack_compute_node02_address: 172.16.10.106
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
index 405b75a..2c58c3d 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
@@ -12,6 +12,8 @@
- python-docker
kubernetes:
pool:
+ kubelet:
+ fail_on_swap: ${_param:kubelet_fail_on_swap}
network:
etcd:
ssl:
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
index 49c80d5..96120d8 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
@@ -40,6 +40,8 @@
image: ${_param:kubernetes_externaldns_image}
provider: ${_param:kubernetes_externaldns_provider}
master:
+ kubelet:
+ fail_on_swap: ${_param:kubelet_fail_on_swap}
etcd:
ssl:
enabled: true
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
index ea70dcc..d3f4430 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
@@ -3,6 +3,9 @@
salt_minion_ca_host: ${_param:infra_config_hostname}.${_param:cluster_domain}
salt_minion_ca_authority: salt_master_ca
+ # kubelet
+ kubelet_fail_on_swap: True
+
# kubernetes settings
kubernetes_admin_user: admin
kubernetes_admin_password: sbPfel23ZigJF3Bm
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
index f9bad77..84a8093 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
@@ -33,6 +33,8 @@
bip: 172.31.255.1/24
kubernetes:
pool:
+ kubelet:
+ fail_on_swap: ${_param:kubelet_fail_on_swap}
network:
engine: opencontrail
config:
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
index e102844..71cbf9c 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
@@ -42,6 +42,8 @@
image: ${_param:kubernetes_externaldns_image}
provider: ${_param:kubernetes_externaldns_provider}
master:
+ kubelet:
+ fail_on_swap: ${_param:kubelet_fail_on_swap}
etcd:
ssl:
enabled: true
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
index 740c4fe..59e2771 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
@@ -4,6 +4,9 @@
salt_minion_ca_host: ${_param:infra_config_hostname}.${_param:cluster_domain}
salt_minion_ca_authority: salt_master_ca
+ # kubelet
+ kubelet_fail_on_swap: True
+
# kubernetes settings
kubernetes_admin_user: admin
kubernetes_admin_password: sbPfel23ZigJF3Bm