commit 1f527341e62256e94326e0ed4dc50676d996442d
author okozachenko1203 <okozachenko1203@users.noreply.github.com> Fri Mar 24 00:27:33 2023 +1100
committer Mohammed Naser <mnaser@vexxhost.com> Fri Mar 24 15:56:34 2023 -0400
tree 413b0c9421c6a3d40148f780f773995825a9aa0a
parent 97bc1d46df67f9731acaccc763705a16d75eee5e

Remove sharev2 and v1

charts/manila/values.yaml

diff --git a/charts/manila/values.yaml b/charts/manila/values.yaml
index 93f983f..c54364a 100644
--- a/charts/manila/values.yaml
+++ b/charts/manila/values.yaml
@@ -904,38 +904,6 @@
         default: 8786
         public: 80
         service: 8786
-  sharev1:
-    name: manila
-    hosts:
-      default: manila-api
-      public: manila
-    host_fqdn_override:
-      default: null
-    path:
-      default: '/v1/%(tenant_id)s'
-    scheme:
-      default: 'http'
-    port:
-      api:
-        default: 8786
-        public: 80
-        service: 8786
-  sharev2:
-    name: manila
-    hosts:
-      default: manila-api
-      public: manila
-    host_fqdn_override:
-      default: null
-    path:
-      default: '/v2/%(tenant_id)s'
-    scheme:
-      default: 'http'
-    port:
-      api:
-        default: 8786
-        public: 80
-        service: 8786
 
   oslo_db:
     auth:

roles/manila/tasks/main.yml

diff --git a/roles/manila/tasks/main.yml b/roles/manila/tasks/main.yml
index d6dad1c..96ffe36 100644
--- a/roles/manila/tasks/main.yml
+++ b/roles/manila/tasks/main.yml
@@ -26,7 +26,7 @@
   ansible.builtin.include_role:
     name: openstack_helm_ingress
   vars:
-    openstack_helm_ingress_endpoint: sharev2
+    openstack_helm_ingress_endpoint: share
     openstack_helm_ingress_service_name: manila-api
     openstack_helm_ingress_service_port: 8786
     openstack_helm_ingress_annotations: "{{ manila_ingress_annotations }}"

roles/openstack_helm_endpoints/vars/main.yml

diff --git a/roles/openstack_helm_endpoints/vars/main.yml b/roles/openstack_helm_endpoints/vars/main.yml
index 7775b6e..4143b11 100644
--- a/roles/openstack_helm_endpoints/vars/main.yml
+++ b/roles/openstack_helm_endpoints/vars/main.yml
@@ -512,7 +512,7 @@
       api:
         public: 443
 
-_openstack_helm_endpoints_sharev2:
+_openstack_helm_endpoints_share:
   identity:
     auth:
       manila:
@@ -523,7 +523,7 @@
     auth:
       manila:
         password: "{{ openstack_helm_endpoints_manila_mariadb_password }}"
-  sharev2:
+  share:
     scheme:
       public: https
     host_fqdn_override: