github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove empty lines when file is generated from jinja template

Browse Source
This commit is contained in:
Alen Komljen
2014-12-02 15:00:58 +01:00
parent 993ef88eec
commit d83d269c27
5 changed files with 110 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
cluster/saltbase/salt/kubelet/default
View File

@@ -1,28 +1,28 @@
{% set daemon_args = "$DAEMON_ARGS" %}
{% if grains['os_family'] == 'RedHat' %}
{% set daemon_args = "" %}
{% endif %}
{% if grains.etcd_servers is defined %}
{% set etcd_servers = "-etcd_servers=http://" + grains.etcd_servers + ":4001" %}
{% else %}
{% set ips = salt['mine.get']('roles:kubernetes-master', 'network.ip_addrs', 'grain').values() %}
{% set etcd_servers = "-etcd_servers=http://" + ips[0][0] + ":4001" %}
{% endif %}
{% set daemon_args = "$DAEMON_ARGS" -%}
{% if grains['os_family'] == 'RedHat' -%}
{% set daemon_args = "" -%}
{% endif -%}
{% if grains.etcd_servers is defined -%}
{% set etcd_servers = "-etcd_servers=http://" + grains.etcd_servers + ":4001" -%}
{% else -%}
{% set ips = salt['mine.get']('roles:kubernetes-master', 'network.ip_addrs', 'grain').values() -%}
{% set etcd_servers = "-etcd_servers=http://" + ips[0][0] + ":4001" -%}
{% endif -%}
{% if grains.apiservers is defined %}
{% set apiservers = "-api_servers=https://" + grains.apiservers + ":6443" %}
{% else %}
{% set ips = salt['mine.get']('roles:kubernetes-master', 'network.ip_addrs', 'grain').values() %}
{% set apiservers = "-api_servers=https://" + ips[0][0] + ":6443" %}
{% endif %}
{% if grains.apiservers is defined -%}
{% set apiservers = "-api_servers=https://" + grains.apiservers + ":6443" -%}
{% else -%}
{% set ips = salt['mine.get']('roles:kubernetes-master', 'network.ip_addrs', 'grain').values() -%}
{% set apiservers = "-api_servers=https://" + ips[0][0] + ":6443" -%}
{% endif -%}
{% set address = "-address=0.0.0.0" %}
{% set config = "-config=/etc/kubernetes/manifests" %}
{% set hostname_override = "" %}
{% if grains.minion_ip is defined %}
{% set hostname_override = " -hostname_override=" + grains.minion_ip %}
{% endif %}
{% set address = "-address=0.0.0.0" -%}
{% set config = "-config=/etc/kubernetes/manifests" -%}
{% set hostname_override = "" -%}
{% if grains.minion_ip is defined -%}
{% set hostname_override = " -hostname_override=" + grains.minion_ip -%}
{% endif -%}
{% set auth_path = "-auth_path=/var/lib/kubelet/kubernetes_auth" %}
{% set auth_path = "-auth_path=/var/lib/kubelet/kubernetes_auth" -%}
DAEMON_ARGS="{{daemon_args}} {{etcd_servers}} {{apiservers}} {{auth_path}} {{hostname_override}} {{address}} {{config}} --allow_privileged={{pillar['allow_privileged']}}"