Merge "Change default port for MDNS service to 53"
diff --git a/classes/cluster/aaa-ha-freeipa/aaa/init.yml b/classes/cluster/aaa-ha-freeipa/aaa/init.yml
index 463b8d2..8da6aee 100644
--- a/classes/cluster/aaa-ha-freeipa/aaa/init.yml
+++ b/classes/cluster/aaa-ha-freeipa/aaa/init.yml
@@ -1,6 +1,10 @@
classes:
#- cluster.aaa-ha-freeipa.aaa
-- system.linux.system.single
+
+# FIXME: Workaround linux.system.single rhel
+#- system.linux.system.single
+- cluster.aaa-ha-freeipa.aaa.linux-system-single
+
- system.openssh.server.team.lab
- system.openssh.server.team.tcpcloud
- system.openssh.server.team.mcp_qa
diff --git a/classes/cluster/aaa-ha-freeipa/aaa/linux-system-single/debian.yml b/classes/cluster/aaa-ha-freeipa/aaa/linux-system-single/debian.yml
new file mode 100644
index 0000000..b6d0b2b
--- /dev/null
+++ b/classes/cluster/aaa-ha-freeipa/aaa/linux-system-single/debian.yml
@@ -0,0 +1,10 @@
+classes:
+- system.linux.system.single
+
+# DEBIAN family overrides
+parameters:
+ linux:
+ system:
+ package:
+ python-msgpack:
+ version: latest
diff --git a/classes/cluster/aaa-ha-freeipa/aaa/linux-system-single/init.yml b/classes/cluster/aaa-ha-freeipa/aaa/linux-system-single/init.yml
new file mode 100644
index 0000000..1e68380
--- /dev/null
+++ b/classes/cluster/aaa-ha-freeipa/aaa/linux-system-single/init.yml
@@ -0,0 +1,73 @@
+classes:
+- service.linux.system
+- service.salt.minion.master
+- system.openssh.server.single
+- system.ntp.client.single
+parameters:
+ _param:
+ local_package_repos: false
+ linux:
+ system:
+ local_package_repos: ${_param:local_package_repos}
+ user:
+ root:
+ enabled: true
+ name: root
+ home: /root
+ package:
+ cloud-init:
+ version: purged
+ unattended-updates:
+ version: purged
+ mcelog:
+ version: latest
+ kernel:
+ modules:
+ - nf_conntrack
+ sysctl:
+ net.ipv4.tcp_keepalive_intvl: 3
+ net.ipv4.tcp_keepalive_time: 30
+ net.ipv4.tcp_keepalive_probes: 8
+ fs.file-max: 124165
+ net.core.somaxconn: 4096
+ vm.swappiness: 10
+ net.nf_conntrack_max: 1048576
+ net.ipv4.tcp_retries2: 5
+ net.ipv4.tcp_max_syn_backlog: 8192
+ net.ipv4.neigh.default.gc_thresh1: 4096
+ net.ipv4.neigh.default.gc_thresh2: 8192
+ net.ipv4.neigh.default.gc_thresh3: 16384
+ net.core.netdev_max_backlog: 261144
+ net.ipv4.tcp_tw_reuse: 1
+ kernel.panic: 60
+ cpu:
+ governor: performance
+ timezone: UTC
+ locale:
+ en_US.UTF-8:
+ enabled: true
+ default: true
+ cs_CZ.UTF-8:
+ enabled: true
+ limit:
+ default:
+ enabled: true
+ domain: "*"
+ limits:
+ - type: hard
+ item: nofile
+ value: 307200
+ - type: soft
+ item: nofile
+ value: 307200
+ - type: soft
+ item: nproc
+ value: 307200
+ - type: hard
+ item: nproc
+ value: 307200
+ systemd:
+ system:
+ Manager:
+ DefaultLimitNOFILE: 307200
+ DefaultLimitNPROC: 307200
diff --git a/classes/cluster/aaa-ha-freeipa/aaa/linux-system-single/rhel.yml b/classes/cluster/aaa-ha-freeipa/aaa/linux-system-single/rhel.yml
new file mode 100644
index 0000000..38dba03
--- /dev/null
+++ b/classes/cluster/aaa-ha-freeipa/aaa/linux-system-single/rhel.yml
@@ -0,0 +1,4 @@
+classes:
+- system.linux.system.single
+
+# RHEL family overrides
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml b/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
index 1e9913f..10d54c9 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
@@ -34,6 +34,8 @@
bip: 172.31.255.1/24
kubernetes:
pool:
+ kubelet:
+ address: ${_param:single_address}
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 f086fd7..6ce6d67 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
@@ -8,7 +8,7 @@
- cluster.k8s-ha-contrail
parameters:
_param:
- keepalived_vip_interface: ens3
+ keepalived_vip_interface: vhost0
keepalived_vip_virtual_router_id: 60
etcd:
server:
@@ -44,6 +44,8 @@
image: ${_param:kubernetes_externaldns_image}
provider: ${_param:kubernetes_externaldns_provider}
master:
+ kubelet:
+ address: ${_param:single_address}
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 ad6ac37..d84f867 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
@@ -26,8 +26,8 @@
kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.7.5-2
kubernetes_virtlet_image: mirantis/virtlet:latest
- kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:v1.1.0
- kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:v1.1.0
+ kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:stable
+ kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:stable
kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
kubernetes_virtlet_image: mirantis/virtlet:v0.7.0
kubernetes_externaldns_image: mirantis/external-dns:latest
@@ -47,7 +47,7 @@
# addresses and hostnames
kubernetes_internal_api_address: 10.254.0.1
kubernetes_control_hostname: ctl
- kubernetes_control_address: 192.168.10.253
+ kubernetes_control_address: 172.16.10.253
kubernetes_control_node01_hostname: ctl01
kubernetes_control_node02_hostname: ctl02
kubernetes_control_node03_hostname: ctl03
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/dashboard.yml b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/dashboard.yml
index a68d16d..d568fb4 100755
--- a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/dashboard.yml
@@ -6,6 +6,7 @@
- system.horizon.server.single
- system.horizon.server.plugin.contrail
- system.horizon.server.plugin.overrides
+- system.horizon.server.plugin.theme
- cluster.virtual-mcp11-contrail-nfv
parameters:
_param:
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/dashboard.yml b/classes/cluster/virtual-mcp11-contrail/openstack/dashboard.yml
index 17b7ace..5d36c54 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/dashboard.yml
@@ -6,6 +6,7 @@
- system.horizon.server.single
- system.horizon.server.plugin.contrail
- system.horizon.server.plugin.overrides
+- system.horizon.server.plugin.theme
- cluster.virtual-mcp11-contrail
parameters:
_param:
diff --git a/classes/cluster/virtual-mcp11-dvr/openstack/dashboard.yml b/classes/cluster/virtual-mcp11-dvr/openstack/dashboard.yml
index 5729943..0b4ed38 100644
--- a/classes/cluster/virtual-mcp11-dvr/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp11-dvr/openstack/dashboard.yml
@@ -4,6 +4,7 @@
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
- system.horizon.server.single
+- system.horizon.server.plugin.theme
- cluster.virtual-mcp11-dvr
parameters:
_param:
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/dashboard.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/dashboard.yml
index 686ccb5..a41617e 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/dashboard.yml
@@ -4,6 +4,7 @@
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
- system.horizon.server.single
+- system.horizon.server.plugin.theme
- cluster.virtual-mcp11-ovs-dpdk
parameters:
_param:
diff --git a/classes/cluster/virtual-mcp11-ovs/openstack/dashboard.yml b/classes/cluster/virtual-mcp11-ovs/openstack/dashboard.yml
index a9cbd60..faeb96f 100644
--- a/classes/cluster/virtual-mcp11-ovs/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp11-ovs/openstack/dashboard.yml
@@ -4,6 +4,7 @@
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
- system.horizon.server.single
+- system.horizon.server.plugin.theme
- cluster.virtual-mcp11-ovs
parameters:
_param: