Merge pull request #1919 from mattymo/fix_rkt_local_vols

Fix local volume provisioner mount point for rkt

roles/kubernetes-apps/local_volume_provisioner/templates/provisioner-admin-account.yml.j2

@@ -8,11 +8,11 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRoleBinding
 metadata:
   name: local-storage-provisioner-pv-binding
-  namespace: default
+  namespace: {{ system_namespace }}
 subjects:
 - kind: ServiceAccount
   name: local-storage-admin
-  namespace: default
+  namespace: {{ system_namespace }}
 roleRef:
   kind: ClusterRole
   name: system:persistent-volume-provisioner
@@ -22,11 +22,11 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRoleBinding
 metadata:
   name: local-storage-provisioner-node-binding
-  namespace: default
+  namespace: {{ system_namespace }}
 subjects:
 - kind: ServiceAccount
   name: local-storage-admin
-  namespace: default
+  namespace: {{ system_namespace }}
 roleRef:
   kind: ClusterRole
   name: system:node

roles/kubernetes/node/templates/kubelet.rkt.service.j2

@@ -32,7 +32,7 @@ ExecStart=/usr/bin/rkt run \
         --volume etc-cni,kind=host,source=/etc/cni,readOnly=true \
         --volume opt-cni,kind=host,source=/opt/cni,readOnly=true \
         --volume var-lib-cni,kind=host,source=/var/lib/cni,readOnly=false \
-        --volume local-volume-base-dir,target {{ local_volume_base_dir }},readOnly=false,recursive=true \
+        --volume local-volume-base-dir,kind=host,source={{ local_volume_base_dir }},readOnly=false,recursive=true \
         --mount volume=etc-cni,target=/etc/cni \
         --mount volume=opt-cni,target=/opt/cni \
         --mount volume=var-lib-cni,target=/var/lib/cni \

roles/kubernetes/preinstall/tasks/main.yml

@@ -60,6 +60,7 @@
     - "{{ kube_config_dir }}/ssl"
     - "{{ kube_manifest_dir }}"
     - "{{ kube_script_dir }}"
+    - "{{ local_volume_base_dir }}"
 
 - name: check cloud_provider value
   fail: