Incorporates changes in master for apps
This commit is contained in:
parent
44e2e2ad3a
commit
ce5d5f6603
1 changed files with 20 additions and 8 deletions
|
@ -7,14 +7,6 @@
|
||||||
register: manifests
|
register: manifests
|
||||||
when: inventory_hostname == groups['kube-master'][0]
|
when: inventory_hostname == groups['kube-master'][0]
|
||||||
|
|
||||||
- name: Kubernetes Apps | Lay Down k8s GlusterFS Endpoint and PV
|
|
||||||
template: src={{item.file}} dest=/etc/kubernetes/{{item.dest}}
|
|
||||||
with_items:
|
|
||||||
- {file: glusterfs-kubernetes-endpoint.json.j2, type: ep, dest: glusterfs-kubernetes-endpoint.json}
|
|
||||||
- {file: glusterfs-kubernetes-pv.yml, type: pv, dest: glusterfs-kubernetes-pv.yml}
|
|
||||||
register: manifests
|
|
||||||
when: inventory_hostname == groups['kube-master'][0] and groups[gfs-cluster] is defined
|
|
||||||
|
|
||||||
- name: Kubernetes Apps | Start Resources
|
- name: Kubernetes Apps | Start Resources
|
||||||
kube:
|
kube:
|
||||||
name: kubedns
|
name: kubedns
|
||||||
|
@ -26,6 +18,26 @@
|
||||||
with_items: "{{ manifests.results }}"
|
with_items: "{{ manifests.results }}"
|
||||||
when: inventory_hostname == groups['kube-master'][0]
|
when: inventory_hostname == groups['kube-master'][0]
|
||||||
|
|
||||||
|
- name: Kubernetes Apps | Lay Down k8s GlusterFS Endpoint and PV
|
||||||
|
template: src={{item.file}} dest=/etc/kubernetes/{{item.dest}}
|
||||||
|
with_items:
|
||||||
|
- {file: glusterfs-kubernetes-pv.yml.j2, type: pv, dest: glusterfs-kubernetes-pv.yml}
|
||||||
|
- {file: glusterfs-kubernetes-endpoint.json.j2, type: ep, dest: glusterfs-kubernetes-endpoint.json}
|
||||||
|
register: gluster_pv
|
||||||
|
when: inventory_hostname == groups['kube-master'][0] and groups['gfs-cluster'] is defined and hostvars[groups['gfs-cluster'][0]].gluster_disk_size_gb is defined
|
||||||
|
|
||||||
|
- name: Kubernetes Apps | Set GlusterFS endpoint and PV
|
||||||
|
kube:
|
||||||
|
name: glusterfs
|
||||||
|
namespace: default
|
||||||
|
kubectl: "{{bin_dir}}/kubectl"
|
||||||
|
resource: "{{item.item.type}}"
|
||||||
|
filename: "/etc/kubernetes/{{item.item.dest}}"
|
||||||
|
state: "{{item.changed | ternary('latest','present') }}"
|
||||||
|
with_items: "{{ gluster_pv.results }}"
|
||||||
|
when: inventory_hostname == groups['kube-master'][0] and groups['gfs-cluster'] is defined
|
||||||
|
|
||||||
|
|
||||||
- include: tasks/calico-policy-controller.yml
|
- include: tasks/calico-policy-controller.yml
|
||||||
when: ( enable_network_policy is defined and enable_network_policy == True ) or
|
when: ( enable_network_policy is defined and enable_network_policy == True ) or
|
||||||
( kube_network_plugin == 'canal' )
|
( kube_network_plugin == 'canal' )
|
||||||
|
|
Loading…
Reference in a new issue