Fix var names
diff --git a/roles/openstack_helm_infra_libvirt/defaults/main.yml b/roles/openstack_helm_infra_libvirt/defaults/main.yml
index 15227b3..d52b29f 100644
--- a/roles/openstack_helm_infra_libvirt/defaults/main.yml
+++ b/roles/openstack_helm_infra_libvirt/defaults/main.yml
@@ -12,9 +12,9 @@
# License for the specific language governing permissions and limitations
# under the License.
-openstack_helm_libvirt_helm_release_name: libvirt
-openstack_helm_libvirt_helm_chart_path: "{{ role_path }}/../../charts/libvirt/"
-openstack_helm_libvirt_helm_chart_ref: /usr/local/src/libvirt
+openstack_helm_infra_libvirt_helm_release_name: libvirt
+openstack_helm_infra_libvirt_helm_chart_path: "{{ role_path }}/../../charts/libvirt/"
+openstack_helm_infra_libvirt_helm_chart_ref: /usr/local/src/libvirt
-openstack_helm_libvirt_helm_release_namespace: openstack
-openstack_helm_libvirt_helm_values: {}
+openstack_helm_infra_libvirt_helm_release_namespace: openstack
+openstack_helm_infra_libvirt_helm_values: {}
diff --git a/roles/openstack_helm_infra_libvirt/meta/main.yml b/roles/openstack_helm_infra_libvirt/meta/main.yml
index 04ecf9e..7fb5192 100644
--- a/roles/openstack_helm_infra_libvirt/meta/main.yml
+++ b/roles/openstack_helm_infra_libvirt/meta/main.yml
@@ -30,5 +30,5 @@
openstack_helm_endpoints_chart: libvirt
- role: upload_helm_chart
vars:
- upload_helm_chart_src: "{{ openstack_helm_libvirt_helm_chart_path }}"
- upload_helm_chart_dest: "{{ openstack_helm_libvirt_helm_chart_ref }}"
+ upload_helm_chart_src: "{{ openstack_helm_infra_libvirt_helm_chart_path }}"
+ upload_helm_chart_dest: "{{ openstack_helm_infra_libvirt_helm_chart_ref }}"
diff --git a/roles/openstack_helm_infra_libvirt/tasks/main.yml b/roles/openstack_helm_infra_libvirt/tasks/main.yml
index c818102..e347c21 100644
--- a/roles/openstack_helm_infra_libvirt/tasks/main.yml
+++ b/roles/openstack_helm_infra_libvirt/tasks/main.yml
@@ -20,8 +20,8 @@
state: patched
api_version: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
- name: "{{ openstack_helm_libvirt_helm_release_name }}"
- namespace: "{{ openstack_helm_libvirt_helm_release_namespace }}"
+ name: "{{ openstack_helm_infra_libvirt_helm_release_name }}"
+ namespace: "{{ openstack_helm_infra_libvirt_helm_release_namespace }}"
definition:
spec:
suspend: true
@@ -31,15 +31,15 @@
state: absent
api_version: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
- name: "{{ openstack_helm_libvirt_helm_release_name }}"
- namespace: "{{ openstack_helm_libvirt_helm_release_namespace }}"
+ name: "{{ openstack_helm_infra_libvirt_helm_release_name }}"
+ namespace: "{{ openstack_helm_infra_libvirt_helm_release_namespace }}"
- name: Deploy Helm chart
run_once: true
kubernetes.core.helm:
- name: "{{ openstack_helm_libvirt_helm_release_name }}"
- chart_ref: "{{ openstack_helm_libvirt_helm_chart_ref }}"
- release_namespace: "{{ openstack_helm_libvirt_helm_release_namespace }}"
+ name: "{{ openstack_helm_infra_libvirt_helm_release_name }}"
+ chart_ref: "{{ openstack_helm_infra_libvirt_helm_chart_ref }}"
+ release_namespace: "{{ openstack_helm_infra_libvirt_helm_release_namespace }}"
create_namespace: true
kubeconfig: /etc/kubernetes/admin.conf
- values: "{{ _openstack_helm_libvirt_helm_values | combine(openstack_helm_libvirt_helm_values, recursive=True) }}"
+ values: "{{ _openstack_helm_infra_libvirt_helm_values | combine(openstack_helm_infra_libvirt_helm_values, recursive=True) }}"