C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2248 from hswong3i/dashboard.yml.j2

Browse source 
Dashboard template should not suffix with .yml.j2
This commit is contained in:
Antoine Legrand 2018-02-06 11:25:02 +01:00 committed by GitHub
commit 37cfd289d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
roles/kubernetes-apps/ansible/tasks/dashboard.yml
View file

@ -2,7 +2,7 @@
- name: Kubernetes Apps | Delete old kubernetes-dashboard resources - name: Kubernetes Apps | Delete old kubernetes-dashboard resources
kube: kube:
name: "kubernetes-dashboard" name: "kubernetes-dashboard"
kubectl: "{{bin_dir}}/kubectl" kubectl: "{{ bin_dir }}/kubectl"
resource: "{{ item }}" resource: "{{ item }}"
state: absent state: absent
with_items: with_items:
@ -12,20 +12,20 @@
- name: Kubernetes Apps | Lay down dashboard template - name: Kubernetes Apps | Lay down dashboard template
template: template:
src: "{{item.file}}" src: "{{ item.file }}.j2"
dest: "{{kube_config_dir}}/{{item.file}}" dest: "{{ kube_config_dir }}/{{ item.file }}"
with_items: with_items:
- {file: dashboard.yml.j2, type: deploy, name: kubernetes-dashboard} - { file: dashboard.yml, type: deploy, name: kubernetes-dashboard }
register: manifests register: manifests
when: inventory_hostname == groups['kube-master'][0] when: inventory_hostname == groups['kube-master'][0]
- name: Kubernetes Apps | Start dashboard - name: Kubernetes Apps | Start dashboard
kube: kube:
name: "{{item.item.name}}" name: "{{ item.item.name }}"
namespace: "{{system_namespace}}" namespace: "{{ system_namespace }}"
kubectl: "{{bin_dir}}/kubectl" kubectl: "{{ bin_dir }}/kubectl"
resource: "{{item.item.type}}" resource: "{{ item.item.type }}"
filename: "{{kube_config_dir}}/{{item.item.file}}" filename: "{{ kube_config_dir }}/{{ item.item.file }}"
state: "latest" state: "latest"
with_items: "{{ manifests.results }}" with_items: "{{ manifests.results }}"
when: inventory_hostname == groups['kube-master'][0] when: inventory_hostname == groups['kube-master'][0]