| commit | 0b4250a974f1fc3d58d9c1132548d62c94cd4c5f | [log] [tgz] |
|---|---|---|
| author | Jakub Pavlik <pavlk.jakub@gmail.com> | Mon Jul 10 12:42:34 2017 +0000 |
| committer | Gerrit Code Review <gerrit2@32a4cf582fa9> | Mon Jul 10 12:42:36 2017 +0000 |
| tree | 012101c71ee47ab9725f032d66bf90c2b01502ab | |
| parent | 46d14b731bd14a499782f367aba6c2289c5464c8 [diff] | |
| parent | ec9b82892d1f88b9a44408b1b7570df73e37dce7 [diff] |
Merge "Use v0.7.0 version for virtlet instead of latest"
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}
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/init.yml b/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/init.yml index 4bcf015..974906b 100644 --- a/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/init.yml +++ b/classes/cluster/virtual-mcp-ocata-cicd/cicd/control/init.yml
@@ -15,6 +15,7 @@ - system.glusterfs.client.volume.rundeck - system.glusterfs.client.volume.salt_pki - system.glusterfs.client.volume.security_monkey + - cluster.virtual-mcp-ocata-cicd.cicd.gluster #- system.glusterfs.client.volume.salt # Docker - system.docker.host
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/cicd/gluster.yml b/classes/cluster/virtual-mcp-ocata-cicd/cicd/gluster.yml index 5a1d1a3..082902e 100644 --- a/classes/cluster/virtual-mcp-ocata-cicd/cicd/gluster.yml +++ b/classes/cluster/virtual-mcp-ocata-cicd/cicd/gluster.yml
@@ -12,4 +12,5 @@ - system.glusterfs.server.volume.pushkin - system.glusterfs.server.volume.registry - system.glusterfs.server.volume.rundeck + - system.glusterfs.server.volume.salt_pki - system.glusterfs.server.volume.security_monkey