scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-25 19:05:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19489 from cloudnativeapps/vsphere-support-1

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-01-26 22:27:55 -08:00
parent 603931f237 f7db2c6e99
commit 86dd321c73
16 changed files with 360 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,7 @@
{% endif -%}
# TODO: remove nginx for other cloud providers.
{% if grains['cloud'] is defined and grains.cloud in [ 'aws', 'gce', 'vagrant' ] %}
{% if grains['cloud'] is defined and grains.cloud in [ 'aws', 'gce', 'vagrant', 'vsphere' ] %}
{% set api_servers_with_port = api_servers -%}
{% else -%}
{% set api_servers_with_port = api_servers + ":6443" -%}
@@ -27,7 +27,7 @@
{% set debugging_handlers = "--enable-debugging-handlers=true" -%}
{% if grains['roles'][0] == 'kubernetes-master' -%}
{% if grains.cloud in ['aws', 'gce', 'vagrant'] -%}
{% if grains.cloud in ['aws', 'gce', 'vagrant', 'vsphere'] -%}
# Unless given a specific directive, disable registration for the kubelet
# running on the master.
@@ -46,7 +46,7 @@
{% endif -%}
{% set cloud_provider = "" -%}
{% if grains.cloud is defined and grains.cloud != 'vagrant' -%}
{% if grains.cloud is defined and grains.cloud not in ['vagrant', 'vsphere'] -%}
{% set cloud_provider = "--cloud-provider=" + grains.cloud -%}
{% endif -%}
@@ -105,7 +105,11 @@
{% set cgroup_root = "" -%}
{% if grains['os_family'] == 'Debian' -%}
{% set system_container = "--system-container=/system" -%}
{% set cgroup_root = "--cgroup-root=/" -%}
{% if pillar.get('is_systemd') %}
{% set cgroup_root = "--cgroup-root=docker" -%}
{% else %}
{% set cgroup_root = "--cgroup-root=/" -%}
{% endif %}
{% endif -%}
{% if grains['oscodename'] == 'vivid' -%}
{% set cgroup_root = "--cgroup-root=docker" -%}