Merge pull request #1238 from Starefossen/fix/namespace-template-file

Move namespace file to template directory
2017-04-20 12:19:55 +03:00 · 2017-04-20 12:19:55 +03:00 · fc5ca5090e
commit fc5ca5090e
parent 8d5d973a64 12bbb243b2
2 changed files with 3 additions and 3 deletions
--- a/roles/kubernetes/master/tasks/main.yml
+++ b/roles/kubernetes/master/tasks/main.yml
@ -34,9 +34,9 @@

 - meta: flush_handlers

- name: copy kube system namespace manifest
-  copy:
-    src: namespace.yml
+- name: Write kube system namespace manifest
+  template:
+    src: namespace.j2
    dest: "{{kube_config_dir}}/{{system_namespace}}-ns.yml"
  run_once: yes
  when: inventory_hostname == groups['kube-master'][0]
--- a/roles/kubernetes/master/templates/namespace.j2
+++ b/roles/kubernetes/master/templates/namespace.j2