Merge pull request #45117 from chuckbutler/add-cifs

Automatic merge from submit-queue (batch tested with PRs 41583, 45117, 45123) Adds the cifs-common package **What this PR does / why we need it**: Enables mounting of CIFS volumes. Required for Azure. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes https://github.com/juju-solutions/bundle-canonical-kubernetes/issues/227 **Release note**: ```release-note Added CIFS PV support for Juju Charms ```

Merge pull request #45117 from chuckbutler/add-cifs
02f9d607 · Kubernetes Submit Queue · GitHub · e2042bb8 · 9ee4e99d · 02f9d607
Commit 02f9d607 authored Apr 28, 2017 by Kubernetes Submit Queue Committed by GitHub Apr 28, 2017
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

layer.yaml cluster/juju/layers/kubernetes-worker/layer.yaml +2 -1

No files found.
--- a/cluster/juju/layers/kubernetes-worker/layer.yaml
+++ b/cluster/juju/layers/kubernetes-worker/layer.yaml
@@ -18,8 +18,9 @@ config:
 options:
  basic:
    packages:
-      - 'nfs-common'
+      - 'cifs-utils'
      - 'ceph-common'
+      - 'nfs-common'
      - 'socat'
  tls-client:
    ca_certificate_path: '/root/cdk/ca.crt'