From fa52399252cb40f50b5518a85fc5aabc4b1a995c Mon Sep 17 00:00:00 2001 From: "Homayoon (Hue) Alimohammadi" Date: Thu, 5 Dec 2024 18:43:30 +0400 Subject: [PATCH 1/4] Add Openstack overlay --- overlays/openstack.yaml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 overlays/openstack.yaml diff --git a/overlays/openstack.yaml b/overlays/openstack.yaml new file mode 100644 index 0000000..46c37b4 --- /dev/null +++ b/overlays/openstack.yaml @@ -0,0 +1,28 @@ +applications: + easyrsa: + charm: easyrsa + channel: stable + num_units: 1 + constraints: cpu-cores=1 mem=4G root-disk=16G + base: ubuntu@22.04 + openstack-integrator: + charm: openstack-integrator + num_units: 1 + trust: true + base: ubuntu@22.04 + openstack-cloud-controller: + charm: openstack-cloud-controller + base: ubuntu@22.04 + cinder-csi: + charm: cinder-csi + base: ubuntu@22.04 +relations: + - [openstack-cloud-controller:certificates, easyrsa:client] + - [openstack-cloud-controller:kube-control, k8s:kube-control] + - [openstack-cloud-controller:external-cloud-provider, k8s:external-cloud-provider] + - [openstack-cloud-controller:openstack, openstack-integrator:clients] + - [easyrsa:client, cinder-csi:certificates] + - [k8s:kube-control, cinder-csi:kube-control] + - [openstack-integrator:clients, cinder-csi:openstack] + # TODO(Hue): Figure out what we should do with loadbalancer + # - [k8s:loadbalancer-external, openstack-integrator:lb-consumers] From 3f70f5c3db7a382e724a6f5b05ed02fb23b76697 Mon Sep 17 00:00:00 2001 From: "Homayoon (Hue) Alimohammadi" Date: Fri, 6 Dec 2024 11:59:38 +0400 Subject: [PATCH 2/4] Remove easyrsa, Remove loadbalancer relation template --- overlays/openstack.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/overlays/openstack.yaml b/overlays/openstack.yaml index 46c37b4..2cdc991 100644 --- a/overlays/openstack.yaml +++ b/overlays/openstack.yaml @@ -1,10 +1,4 @@ applications: - easyrsa: - charm: easyrsa - channel: stable - num_units: 1 - constraints: cpu-cores=1 mem=4G root-disk=16G - base: ubuntu@22.04 openstack-integrator: charm: openstack-integrator num_units: 1 @@ -17,12 +11,8 @@ applications: charm: cinder-csi base: ubuntu@22.04 relations: - - [openstack-cloud-controller:certificates, easyrsa:client] - [openstack-cloud-controller:kube-control, k8s:kube-control] - [openstack-cloud-controller:external-cloud-provider, k8s:external-cloud-provider] - [openstack-cloud-controller:openstack, openstack-integrator:clients] - [easyrsa:client, cinder-csi:certificates] - - [k8s:kube-control, cinder-csi:kube-control] - [openstack-integrator:clients, cinder-csi:openstack] - # TODO(Hue): Figure out what we should do with loadbalancer - # - [k8s:loadbalancer-external, openstack-integrator:lb-consumers] From 901fde117a81dba8f5e3cf6499bbc465c9b10822 Mon Sep 17 00:00:00 2001 From: "Homayoon (Hue) Alimohammadi" Date: Mon, 9 Dec 2024 13:44:00 +0400 Subject: [PATCH 3/4] Remove leftover easyrsa relation --- overlays/openstack.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/overlays/openstack.yaml b/overlays/openstack.yaml index 2cdc991..60338b6 100644 --- a/overlays/openstack.yaml +++ b/overlays/openstack.yaml @@ -14,5 +14,4 @@ relations: - [openstack-cloud-controller:kube-control, k8s:kube-control] - [openstack-cloud-controller:external-cloud-provider, k8s:external-cloud-provider] - [openstack-cloud-controller:openstack, openstack-integrator:clients] - - [easyrsa:client, cinder-csi:certificates] - [openstack-integrator:clients, cinder-csi:openstack] From 75950ddf36c1f05f915c99dda80e86ff91cfd28e Mon Sep 17 00:00:00 2001 From: "Homayoon (Hue) Alimohammadi" Date: Mon, 9 Dec 2024 20:18:26 +0400 Subject: [PATCH 4/4] Remove base from subordinate charms, Add kube-control to cinder-csi --- overlays/openstack.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/overlays/openstack.yaml b/overlays/openstack.yaml index 60338b6..07659c7 100644 --- a/overlays/openstack.yaml +++ b/overlays/openstack.yaml @@ -6,12 +6,11 @@ applications: base: ubuntu@22.04 openstack-cloud-controller: charm: openstack-cloud-controller - base: ubuntu@22.04 cinder-csi: charm: cinder-csi - base: ubuntu@22.04 relations: - [openstack-cloud-controller:kube-control, k8s:kube-control] + - [cinder-csi:kube-control, k8s:kube-control] - [openstack-cloud-controller:external-cloud-provider, k8s:external-cloud-provider] - [openstack-cloud-controller:openstack, openstack-integrator:clients] - - [openstack-integrator:clients, cinder-csi:openstack] + - [cinder-csi:openstack, openstack-integrator:clients]