Fix release name and vars
diff --git a/roles/openstack_helm_infra_ceph_provisioners/defaults/main.yml b/roles/openstack_helm_infra_ceph_provisioners/defaults/main.yml
index ca5fed9..1f64828 100644
--- a/roles/openstack_helm_infra_ceph_provisioners/defaults/main.yml
+++ b/roles/openstack_helm_infra_ceph_provisioners/defaults/main.yml
@@ -12,12 +12,12 @@
# License for the specific language governing permissions and limitations
# under the License.
-openstack_helm_ceph_provisioners_helm_release_name: ceph_provisioners
-openstack_helm_ceph_provisioners_helm_chart_path: "{{ role_path }}/../../charts/ceph_provisioners/"
-openstack_helm_ceph_provisioners_helm_chart_ref: /usr/local/src/ceph_provisioners
+openstack_helm_infra_ceph_provisioners_helm_release_name: ceph-provisioners
+openstack_helm_infra_ceph_provisioners_helm_chart_path: "{{ role_path }}/../../charts/ceph-provisioners/"
+openstack_helm_infra_ceph_provisioners_helm_chart_ref: /usr/local/src/ceph-provisioners
-openstack_helm_ceph_provisioners_helm_release_namespace: openstack
-openstack_helm_ceph_provisioners_helm_values: {}
+openstack_helm_infra_ceph_provisioners_helm_release_namespace: openstack
+openstack_helm_infra_ceph_provisioners_helm_values: {}
# Ansible inventory group containing Ceph monitors.
openstack_helm_infra_ceph_provisioners_ceph_mon_group: controllers
diff --git a/roles/openstack_helm_infra_ceph_provisioners/meta/main.yml b/roles/openstack_helm_infra_ceph_provisioners/meta/main.yml
index a6c7563..3285da0 100644
--- a/roles/openstack_helm_infra_ceph_provisioners/meta/main.yml
+++ b/roles/openstack_helm_infra_ceph_provisioners/meta/main.yml
@@ -30,6 +30,6 @@
openstack_helm_endpoints_chart: ceph_provisioners
- role: upload_helm_chart
vars:
- upload_helm_chart_src: "{{ openstack_helm_ceph_provisioners_helm_chart_path }}"
- upload_helm_chart_dest: "{{ openstack_helm_ceph_provisioners_helm_chart_ref }}"
+ upload_helm_chart_src: "{{ openstack_helm_infra_ceph_provisioners_helm_chart_path }}"
+ upload_helm_chart_dest: "{{ openstack_helm_infra_ceph_provisioners_helm_chart_ref }}"
- role: ceph_csi_rbd
diff --git a/roles/openstack_helm_infra_ceph_provisioners/tasks/main.yml b/roles/openstack_helm_infra_ceph_provisioners/tasks/main.yml
index 3fa449f..336ab01 100644
--- a/roles/openstack_helm_infra_ceph_provisioners/tasks/main.yml
+++ b/roles/openstack_helm_infra_ceph_provisioners/tasks/main.yml
@@ -105,9 +105,9 @@
- name: Deploy Helm chart
run_once: true
kubernetes.core.helm:
- name: "{{ openstack_helm_ceph_provisioners_helm_release_name }}"
- chart_ref: "{{ openstack_helm_ceph_provisioners_helm_chart_ref }}"
- release_namespace: "{{ openstack_helm_ceph_provisioners_helm_release_namespace }}"
+ name: "{{ openstack_helm_infra_ceph_provisioners_helm_release_name }}"
+ chart_ref: "{{ openstack_helm_infra_ceph_provisioners_helm_chart_ref }}"
+ release_namespace: "{{ openstack_helm_infra_ceph_provisioners_helm_release_namespace }}"
create_namespace: true
kubeconfig: /etc/kubernetes/admin.conf
- values: "{{ _openstack_helm_ceph_provisioners_helm_values | combine(openstack_helm_ceph_provisioners_helm_values, recursive=True) }}"
+ values: "{{ _openstack_helm_infra_ceph_provisioners_helm_values | combine(openstack_helm_infra_ceph_provisioners_helm_values, recursive=True) }}"