move kubelet.kubeconfig to _common
Kubeconfig is required for kubelet service so lets put is together in _common. Change-Id: Id4bca7488b690bdf38bdfe4e54a58b8886f04248
This commit is contained in:
parent
4e72dfa728
commit
7f43ee0b04
|
@ -88,6 +88,21 @@ hyperkube-copy:
|
|||
|
||||
{%- endif %}
|
||||
|
||||
manifest_dir_create:
|
||||
file.directory:
|
||||
- name: /etc/kubernetes/manifests
|
||||
- user: root
|
||||
- group: root
|
||||
- mode: 0751
|
||||
|
||||
/etc/kubernetes/kubelet.kubeconfig:
|
||||
file.managed:
|
||||
- source: salt://kubernetes/files/kubelet/kubelet.kubeconfig
|
||||
- template: jinja
|
||||
- user: root
|
||||
- group: root
|
||||
- mode: 644
|
||||
- makedirs: true
|
||||
|
||||
kubelet_service:
|
||||
service.running:
|
||||
|
@ -97,5 +112,6 @@ kubelet_service:
|
|||
- file: /etc/default/kubelet
|
||||
- file: /usr/bin/hyperkube
|
||||
- file: /etc/kubernetes/kubelet.kubeconfig
|
||||
- file: manifest_dir_create
|
||||
|
||||
{% endif %}
|
||||
|
|
|
@ -1,22 +1,6 @@
|
|||
{%- from "kubernetes/map.jinja" import pool with context %}
|
||||
{%- if pool.enabled %}
|
||||
|
||||
/etc/kubernetes/kubelet.kubeconfig:
|
||||
file.managed:
|
||||
- source: salt://kubernetes/files/kubelet/kubelet.kubeconfig
|
||||
- template: jinja
|
||||
- user: root
|
||||
- group: root
|
||||
- mode: 644
|
||||
- makedirs: true
|
||||
|
||||
manifest-dir-create:
|
||||
file.directory:
|
||||
- name: /etc/kubernetes/manifests
|
||||
- user: root
|
||||
- group: root
|
||||
- mode: 0751
|
||||
|
||||
{%- if pool.host.label is defined %}
|
||||
|
||||
{%- for name,label in pool.host.label.iteritems() %}
|
||||
|
|
Loading…
Reference in New Issue