diff --git a/k8s/filesystems.sls b/k8s/filesystems.sls index 23b8684..8509883 100644 --- a/k8s/filesystems.sls +++ b/k8s/filesystems.sls @@ -1,5 +1,6 @@ -#{% set glusterfs_ip_list = ['ebin01', 'ebin02'] %} + {% set rnd = salt['random.rand_int'](1, 2) %} +{% set vol = 'k8s-data-fast' %} mount nfs volume-docker: mount.mounted: @@ -13,9 +14,6 @@ mount nfs volume-docker: - pass_num: 0 - #{%- for vol in ['k8s-data-slow', 'k8s-data-fast'] %} -{%- for vol in ['k8s-data-fast'] %} - mount nfs volume-{{ vol }}: mount.mounted: - name: /net/{{ vol }} @@ -26,18 +24,4 @@ mount nfs volume-{{ vol }}: - persist: True - dump: 0 - pass_num: 0 -{%- endfor %} -#{%- if grains['nodename'] in ["pine01", "pine02", "pine03"] %} -#mount raw volume-docker: -# mount.mounted: -# - name: /var/lib/docker -# - device: /net/docker/{{ grains['nodename'] }}-docker.raw -# - fstype: ext4 -# - opts: _netdev,rw,defaults,noatime,nodiratime,x-systemd.requires-mounts-for=/net/docker -# - mkmnt: True -# - dump: 0 -# - pass_num: 0 -# - require: -# - mount: /net/docker -#{%- endif %} diff --git a/k8s/init.sls b/k8s/init.sls index a2f46eb..a73b360 100644 --- a/k8s/init.sls +++ b/k8s/init.sls @@ -3,7 +3,7 @@ --- include: - .admin - - .filesystems + #- .filesystems /etc/default/kubelet: @@ -21,4 +21,5 @@ k8s_pkgs: - debootstrap - kubectl - kubelet + - kubetail - qemu-utils