Merge branch 'master' of github.com:kubernetes-sigs/kubespray into image_builder_1

This commit is contained in:
Andreas Kruger 2019-01-04 10:18:23 +01:00
commit 352fbd71e7
No known key found for this signature in database
GPG key ID: 2D96B451C904462C
4 changed files with 9 additions and 31 deletions

View file

@ -50,7 +50,7 @@ cephfs_provisioner_enabled: false
ingress_nginx_enabled: false
# ingress_nginx_host_network: false
# ingress_nginx_nodeselector:
# node-role.kubernetes.io/master: ""
# node-role.kubernetes.io/node: ""
# ingress_nginx_tolerations:
# - key: "node-role.kubernetes.io/master"
# operator: "Equal"

View file

@ -1,7 +1,4 @@
---
bootstrap_os:
os_family: "{{bootstrap_os}}"
pip_python_coreos_modules:
- httplib2
- six

View file

@ -5,45 +5,26 @@
changed_when: false
environment: {}
- name: Set bootstrap_os
set_fact:
os_family: >-
{%- if 'Ubuntu' in os_release.stdout -%}
ubuntu
{%- elif 'Debian' in os_release.stdout -%}
debian
{%- elif 'CoreOS' in os_release.stdout -%}
coreos
{%- elif 'Fedora' in os_release.stdout -%}
fedora
{%- elif 'CentOS' in os_release.stdout -%}
centos
{%- elif 'OpenSUSE' in os_release.stdout -%}
opensuse
{%- elif 'Clear Linux OS' in os_release.stdout -%}
clearlinux
{%- endif -%}
- include_tasks: bootstrap-ubuntu.yml
when: os_family == "ubuntu"
when: '"Ubuntu" in os_release.stdout'
- include_tasks: bootstrap-debian.yml
when: os_family == "debian"
when: '"Debian" in os_release.stdout'
- include_tasks: bootstrap-coreos.yml
when: os_family == "coreos"
when: '"CoreOS" in os_release.stdout'
- include_tasks: bootstrap-fedora.yml
when: os_family == "fedora"
when: '"Fedora" in os_release.stdout'
- include_tasks: bootstrap-centos.yml
when: os_family == "centos"
when: '"CentOS" in os_release.stdout'
- include_tasks: bootstrap-opensuse.yml
when: os_family == "opensuse"
when: '"OpenSUSE" in os_release.stdout'
- include_tasks: bootstrap-clearlinux.yml
when: os_family == "clearlinux"
when: '"Clear Linux OS" in os_release.stdout'
- import_tasks: setup-pipelining.yml

View file

@ -2,7 +2,7 @@
ingress_nginx_namespace: "ingress-nginx"
ingress_nginx_host_network: false
ingress_nginx_nodeselector:
node-role.kubernetes.io/master: ""
node-role.kubernetes.io/node: ""
ingress_nginx_tolerations: []
ingress_nginx_insecure_port: 80
ingress_nginx_secure_port: 443