Merge ~freyes/stsstack-bundles:set-cephfs-as-default into stsstack-bundles:master

[Felipe Reyes]

[Felipe Reyes (freyes)]

feel free to suggest a better name :D I just used what came to my mind

[Jorge Niedbalski (niedbalski)]

does this needs to be run on ./configure?

review: Needs Information

[Jorge Niedbalski (niedbalski)]

just to complement what we talked in ~hackers, configure should check if ceph-fs is present, and if present, the proposed script should be run regardless.

review: Needs Fixing

[Hemanth Nakkina (hemanth-n)]

ceph-xfs annotation storageclass.kubernetes.io/is-default-class is updated back to true by the kubernetes-master charm during update-status.

Change the script to use charm configuration
juju config kubernetes-master default-storage=cephfs

review: Needs Fixing

[Felipe Reyes (freyes)]

On Fri, 2020-11-27 at 04:41 +0000, Hemanth Nakkina wrote:
> Review: Needs Fixing
>
> ceph-xfs annotation storageclass.kubernetes.io/is-default-class is
> updated back to true by the kubernetes-master charm during update-
> status.
>
> Change the script to use charm configuration
> juju config kubernetes-master default-storage=cephfs

:-O this was way simpler, thanks, will do.

--
Felipe Reyes
Software Sustaining Engineer @ Canonical
# Email: <email address hidden> (GPG:0x9B1FFF39)
# Launchpad: ~freyes | IRC: freyes

[Felipe Reyes (freyes)]

On Fri, 2020-11-27 at 14:24 +0000, Felipe Reyes wrote:
> On Fri, 2020-11-27 at 04:41 +0000, Hemanth Nakkina wrote:
> > Review: Needs Fixing
> >
> > ceph-xfs annotation storageclass.kubernetes.io/is-default-class is
> > updated back to true by the kubernetes-master charm during update-
> > status.
> >
> > Change the script to use charm configuration
> > juju config kubernetes-master default-storage=cephfs
>
> :-O this was way simpler, thanks, will do.

done. Ready for review.

>
--
Felipe Reyes
Software Sustaining Engineer @ Canonical
# Email: <email address hidden> (GPG:0x9B1FFF39)
# Launchpad: ~freyes | IRC: freyes

[Hemanth Nakkina (hemanth-n)]

LGTM

review: Approve

diff --git a/kubernetes/configure b/kubernetes/configure
index 5a1a111..3cd05b1 100755
--- a/kubernetes/configure
+++ b/kubernetes/configure
@@ -32,5 +32,4 @@ if [[ `juju status keystone --format=json 2>/dev/null| jq '.machines| length'` -
     source kube-keystone.sh
 fi
 
-
 kubectl --namespace kube-system get pods
diff --git a/kubernetes/pipeline/02configure b/kubernetes/pipeline/02configure
index 91bdea0..a3a862a 100644
--- a/kubernetes/pipeline/02configure
+++ b/kubernetes/pipeline/02configure
@@ -74,6 +74,7 @@ do
             ;;
         --ceph-fs)
             MOD_OVERLAYS+=( "ceph-fs.yaml" )
+            MOD_OVERLAYS+=( "ceph-fs-k8s.yaml" )
             ;;
         --ceph-fs-ha*)
             get_units $1 __NUM_CEPH_FS_UNITS__ 3
diff --git a/overlays/ceph-fs-k8s.yaml b/overlays/ceph-fs-k8s.yaml
new file mode 100644
index 0000000..9e255b4
--- /dev/null
+++ b/overlays/ceph-fs-k8s.yaml
@@ -0,0 +1,4 @@
+applications:
+  kubernetes-master:
+    options:
+      default-storage: cephfs