Adjust test in salt file to use boolean value

This commit is contained in:
Satnam Singh
2014-10-20 11:01:13 -07:00
parent 893e897d9b
commit b7722a631d
6 changed files with 52 additions and 1 deletions

View File

@@ -0,0 +1,21 @@
version: v1beta2
id: fluentd-to-elasticsearch
containers:
- name: fluentd-es
image: kubernetes/fluentd-elasticsearch
volumeMounts:
- name: containers
mountPath: /var/lib/docker/containers
readOnly: true
- name: hosts
mountPath: /outerhost
readOnly: true
volumes:
- name: containers
source:
hostDir:
path: /var/lib/docker/containers
- name: hosts
source:
hostDir:
path: /etc/hosts

View File

@@ -0,0 +1,8 @@
/etc/kubernetes/manifests/fluentd-es.manifest:
file.managed:
- source: salt://fluentd-es/fluentd-es.manifest
- user: root
- group: root
- mode: 644
- makedirs: true
- dir_mode: 755

View File

@@ -8,6 +8,9 @@ base:
- kubelet
- kube-proxy
- cadvisor
{% if pillar['use-fluentd-es'] is defined and pillar['use-fluentd-es'] %}
- fluentd-es
{% endif %}
# We need a binary release of nsinit
# - nsinit
- logrotate
@@ -36,4 +39,3 @@ base:
'roles:kubernetes-pool-vagrant':
- match: grain
- vagrant