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

Fix yaml checks

Browse source
This commit is contained in:
mlushpenko 2018-09-06 16:26:57 +02:00
parent f958b32c83
commit ea2c9d8f57
6 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/kubernetes-apps/helm/tasks/main.yml
View file

@ -39,7 +39,7 @@
register: install_helm register: install_helm
changed_when: false changed_when: false
#FIXME: https://github.com/helm/helm/issues/4063 # FIXME: https://github.com/helm/helm/issues/4063
- name: Helm | Force apply tiller overrides if necessary - name: Helm | Force apply tiller overrides if necessary
shell: > shell: >
{{ bin_dir }}/helm init --upgrade --tiller-image={{ tiller_image_repo }}:{{ tiller_image_tag }} --tiller-namespace={{ tiller_namespace }} {{ bin_dir }}/helm init --upgrade --tiller-image={{ tiller_image_repo }}:{{ tiller_image_tag }} --tiller-namespace={{ tiller_namespace }}

1
roles/kubernetes/preinstall/tasks/0050-create_directories.yml
View file

@ -1,3 +1,4 @@
---
- name: Create kubernetes directories - name: Create kubernetes directories
file: file:
path: "{{ item }}" path: "{{ item }}"

1
roles/kubernetes/preinstall/tasks/0070-system-packages.yml
View file

@ -1,3 +1,4 @@
---
- name: Update package management cache (YUM) - name: Update package management cache (YUM)
yum: yum:
update_cache: yes update_cache: yes

1
roles/kubernetes/preinstall/tasks/0080-system-configurations.yml
View file

@ -1,3 +1,4 @@
---
# Todo : selinux configuration # Todo : selinux configuration
- name: Confirm selinux deployed - name: Confirm selinux deployed
stat: stat:

2
roles/network_plugin/calico/defaults/main.yml
View file

@ -2,7 +2,7 @@
# Enables Internet connectivity from containers # Enables Internet connectivity from containers
nat_outgoing: true nat_outgoing: true
#add default ippool name # add default ippool name
calico_pool_name: "default-pool" calico_pool_name: "default-pool"
# Use IP-over-IP encapsulation across hosts # Use IP-over-IP encapsulation across hosts

16
roles/network_plugin/calico/tasks/install.yml
View file

@ -164,10 +164,10 @@
delay: "{{ retry_stagger | random + 3 }}" delay: "{{ retry_stagger | random + 3 }}"
with_items: "{{ peers|default([]) }}" with_items: "{{ peers|default([]) }}"
when: when:
- calico_version_on_server.stdout|version_compare('v3.0.0', '<') - calico_version_on_server.stdout|version_compare('v3.0.0', '<')
- not calico_upgrade_enabled - not calico_upgrade_enabled
- peer_with_router|default(false) - peer_with_router|default(false)
- inventory_hostname in groups['k8s-cluster'] - inventory_hostname in groups['k8s-cluster']
- name: Calico | Configure peering with route reflectors - name: Calico | Configure peering with route reflectors
shell: > shell: >
@ -208,10 +208,10 @@
delay: "{{ retry_stagger | random + 3 }}" delay: "{{ retry_stagger | random + 3 }}"
with_items: "{{ groups['calico-rr'] | default([]) }}" with_items: "{{ groups['calico-rr'] | default([]) }}"
when: when:
- calico_version_on_server.stdout|version_compare('v3.0.0', '<') - calico_version_on_server.stdout|version_compare('v3.0.0', '<')
- not calico_upgrade_enabled - not calico_upgrade_enabled
- peer_with_calico_rr|default(false) - peer_with_calico_rr|default(false)
- hostvars[item]['cluster_id'] == cluster_id - hostvars[item]['cluster_id'] == cluster_id
- name: Calico | Create calico manifests - name: Calico | Create calico manifests