commit | 46d14b731bd14a499782f367aba6c2289c5464c8 | [log] [tgz] |
---|---|---|
author | Adam Tengler <atengler@mirantis.com> | Mon Jul 10 12:15:50 2017 +0000 |
committer | Gerrit Code Review <gerrit2@32a4cf582fa9> | Mon Jul 10 12:15:51 2017 +0000 |
tree | eabb987b2cfc21d669648e31f5dbf9fd8663c0a1 | |
parent | 62c1099570cdff50eedb8b34cbaf0cc34f3e3d6e [diff] | |
parent | adeb96fab30b3d587d4531fb694e3d6aa0f6a53c [diff] |
Merge "Removed unnecessary metadata from k8s_ha_calico"
diff --git a/classes/cluster/k8s_ha_calico/infra/init.yml b/classes/cluster/k8s_ha_calico/infra/init.yml index d6bda6d..3220d0e 100644 --- a/classes/cluster/k8s_ha_calico/infra/init.yml +++ b/classes/cluster/k8s_ha_calico/infra/init.yml
@@ -7,7 +7,6 @@ - system.openssh.server.team.tcpcloud - system.openssh.server.team.mcp_qa - system.openssh.server.team.k8s_team -- system.rsyslog.client.single parameters: _param: # infra service addresses
diff --git a/classes/cluster/k8s_ha_calico/kubernetes/init.yml b/classes/cluster/k8s_ha_calico/kubernetes/init.yml index 7533873..c3c13a4 100644 --- a/classes/cluster/k8s_ha_calico/kubernetes/init.yml +++ b/classes/cluster/k8s_ha_calico/kubernetes/init.yml
@@ -51,12 +51,6 @@ linux: network: - resolv: - domain: virtual-mcp11-k8s-calico.local - options: - - ndots:5 - - timeout:2 - - attempts:2 host: ctl: address: ${_param:kubernetes_control_address}