Address standalone kubelet config case

Also place in global vars and do not repeat the kube_*_config_dir
and kube_namespace vars for better code maintainability and UX.

Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
This commit is contained in:
Bogdan Dobrelya
2016-12-13 11:43:06 +01:00
parent 45135ad3e4
commit c75f394707
35 changed files with 92 additions and 150 deletions

View File

@@ -35,12 +35,12 @@
- name: Canal | Write canal configmap
template:
src: canal-config.yml.j2
dest: /etc/kubernetes/canal-config.yaml
dest: "{{kube_config_dir}}/canal-config.yaml"
- name: Canal | Write canal node configuration
template:
src: canal-node.yml.j2
dest: /etc/kubernetes/canal-node.yaml
dest: "{{kube_config_dir}}/canal-node.yaml"
- name: Canal | Copy cni plugins from hyperkube
command: "/usr/bin/docker run --rm -v /opt/cni/bin:/cnibindir {{ hyperkube_image_repo }}:{{ hyperkube_image_tag }} /usr/bin/rsync -a /opt/cni/bin/ /cnibindir/"

View File

@@ -10,7 +10,7 @@
- name: Flannel | Create flannel pod manifest
template:
src: flannel-pod.yml
dest: /etc/kubernetes/manifests/flannel-pod.manifest
dest: "{{kube_manifest_dir}}/flannel-pod.manifest"
notify: Flannel | delete default docker bridge
- name: Flannel | Wait for flannel subnet.env file presence

View File

@@ -3,7 +3,7 @@
apiVersion: "v1"
metadata:
name: "flannel"
namespace: "kube-system"
namespace: "{{system_namespace}}"
labels:
app: "flannel"
version: "v0.1"