Add optional kubeconfig path to roles (#1871)
Reviewed-by: Mohammed Naser <mnaser@vexxhost.com>
Reviewed-by: Austin Talbot
diff --git a/roles/barbican/defaults/main.yml b/roles/barbican/defaults/main.yml
index 219752d..8d2abc6 100644
--- a/roles/barbican/defaults/main.yml
+++ b/roles/barbican/defaults/main.yml
@@ -17,6 +17,7 @@
barbican_helm_chart_ref: /usr/local/src/barbican
barbican_helm_release_namespace: openstack
+barbican_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
barbican_helm_values: {}
# List of annotations to apply to the Ingress
diff --git a/roles/barbican/tasks/main.yml b/roles/barbican/tasks/main.yml
index f6f4aaf..d7261dc 100644
--- a/roles/barbican/tasks/main.yml
+++ b/roles/barbican/tasks/main.yml
@@ -19,7 +19,7 @@
chart_ref: "{{ barbican_helm_chart_ref }}"
release_namespace: "{{ barbican_helm_release_namespace }}"
create_namespace: true
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ barbican_helm_kubeconfig }}"
values: "{{ _barbican_helm_values | combine(barbican_helm_values, recursive=True) }}"
- name: Create Ingress
diff --git a/roles/ceph_csi_rbd/defaults/main.yml b/roles/ceph_csi_rbd/defaults/main.yml
index c64ad8f..84c4ad4 100644
--- a/roles/ceph_csi_rbd/defaults/main.yml
+++ b/roles/ceph_csi_rbd/defaults/main.yml
@@ -22,4 +22,5 @@
ceph_csi_rbd_helm_chart_ref: /usr/local/src/ceph-csi-rbd
ceph_csi_rbd_helm_release_namespace: kube-system
+ceph_csi_rbd_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
ceph_csi_rbd_helm_values: {}
diff --git a/roles/ceph_csi_rbd/tasks/main.yml b/roles/ceph_csi_rbd/tasks/main.yml
index 3a03a26..bea4a1c 100644
--- a/roles/ceph_csi_rbd/tasks/main.yml
+++ b/roles/ceph_csi_rbd/tasks/main.yml
@@ -65,5 +65,5 @@
chart_ref: "{{ ceph_csi_rbd_helm_chart_ref }}"
release_namespace: "{{ ceph_csi_rbd_helm_release_namespace }}"
create_namespace: true
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ ceph_csi_rbd_helm_kubeconfig }}"
values: "{{ _ceph_csi_rbd_helm_values | combine(ceph_csi_rbd_helm_values, recursive=True) }}"
diff --git a/roles/ceph_provisioners/defaults/main.yml b/roles/ceph_provisioners/defaults/main.yml
index 6c5366b..23b0aae 100644
--- a/roles/ceph_provisioners/defaults/main.yml
+++ b/roles/ceph_provisioners/defaults/main.yml
@@ -17,6 +17,7 @@
ceph_provisioners_helm_chart_ref: /usr/local/src/ceph-provisioners
ceph_provisioners_helm_release_namespace: openstack
+ceph_provisioners_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
ceph_provisioners_helm_values: {}
# Ansible inventory group containing Ceph monitors.
@@ -27,6 +28,3 @@
# Cluster (replication) network used by Ceph
ceph_provisioners_ceph_cluster_network: "{{ ceph_provisioners_ceph_public_network }}"
-
-# Overrides for Helm chart values
-ceph_provisioners_values: {}
diff --git a/roles/ceph_provisioners/tasks/main.yml b/roles/ceph_provisioners/tasks/main.yml
index e62069b..91fb4cf 100644
--- a/roles/ceph_provisioners/tasks/main.yml
+++ b/roles/ceph_provisioners/tasks/main.yml
@@ -112,5 +112,5 @@
chart_ref: "{{ ceph_provisioners_helm_chart_ref }}"
release_namespace: "{{ ceph_provisioners_helm_release_namespace }}"
create_namespace: true
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ ceph_provisioners_helm_kubeconfig }}"
values: "{{ _ceph_provisioners_helm_values | combine(ceph_provisioners_helm_values, recursive=True) }}"
diff --git a/roles/cinder/defaults/main.yml b/roles/cinder/defaults/main.yml
index 31d8a8e..9a2012f 100644
--- a/roles/cinder/defaults/main.yml
+++ b/roles/cinder/defaults/main.yml
@@ -17,6 +17,7 @@
cinder_helm_chart_ref: /usr/local/src/cinder
cinder_helm_release_namespace: openstack
+cinder_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
cinder_helm_values: {}
# List of annotations to apply to the Ingress
diff --git a/roles/cinder/tasks/main.yml b/roles/cinder/tasks/main.yml
index 0da6a3e..aa7b213 100644
--- a/roles/cinder/tasks/main.yml
+++ b/roles/cinder/tasks/main.yml
@@ -29,7 +29,7 @@
chart_ref: "{{ cinder_helm_chart_ref }}"
release_namespace: "{{ cinder_helm_release_namespace }}"
create_namespace: true
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ cinder_helm_kubeconfig }}"
values: "{{ _cinder_helm_values | combine(cinder_helm_values, recursive=True) }}"
- name: Create Ingress
diff --git a/roles/coredns/defaults/main.yml b/roles/coredns/defaults/main.yml
index 24282ff..fd664d7 100644
--- a/roles/coredns/defaults/main.yml
+++ b/roles/coredns/defaults/main.yml
@@ -17,4 +17,5 @@
coredns_helm_chart_ref: /usr/local/src/coredns
coredns_helm_release_namespace: openstack
+coredns_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
coredns_helm_values: {}
diff --git a/roles/coredns/tasks/main.yml b/roles/coredns/tasks/main.yml
index 09fad52..bcb8b7e 100644
--- a/roles/coredns/tasks/main.yml
+++ b/roles/coredns/tasks/main.yml
@@ -20,5 +20,5 @@
chart_ref: "{{ coredns_helm_chart_ref }}"
release_namespace: "{{ coredns_helm_release_namespace }}"
create_namespace: true
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ coredns_helm_kubeconfig }}"
values: "{{ _coredns_helm_values | combine(coredns_helm_values, recursive=True) }}"
diff --git a/roles/designate/defaults/main.yml b/roles/designate/defaults/main.yml
index 5c94d5b..7932b41 100644
--- a/roles/designate/defaults/main.yml
+++ b/roles/designate/defaults/main.yml
@@ -17,6 +17,7 @@
designate_helm_chart_ref: /usr/local/src/designate
designate_helm_release_namespace: openstack
+designate_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
designate_helm_values: {}
# List of annotations to apply to the Ingress
diff --git a/roles/designate/tasks/main.yml b/roles/designate/tasks/main.yml
index e43c1ce..fe90969 100644
--- a/roles/designate/tasks/main.yml
+++ b/roles/designate/tasks/main.yml
@@ -23,7 +23,7 @@
chart_ref: "{{ designate_helm_chart_ref }}"
release_namespace: "{{ designate_helm_release_namespace }}"
create_namespace: true
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ designate_helm_kubeconfig }}"
values: "{{ _designate_helm_values | combine(designate_helm_values, recursive=True) }}"
- name: Create Ingress
diff --git a/roles/glance/defaults/main.yml b/roles/glance/defaults/main.yml
index 5d9dc6e..d747588 100644
--- a/roles/glance/defaults/main.yml
+++ b/roles/glance/defaults/main.yml
@@ -17,6 +17,7 @@
glance_helm_chart_ref: /usr/local/src/glance
glance_helm_release_namespace: openstack
+glance_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
glance_helm_values: {}
# List of annotations to apply to the Ingress
diff --git a/roles/glance/tasks/main.yml b/roles/glance/tasks/main.yml
index 5bf19e8..32cf42c 100644
--- a/roles/glance/tasks/main.yml
+++ b/roles/glance/tasks/main.yml
@@ -19,7 +19,7 @@
chart_ref: "{{ glance_helm_chart_ref }}"
release_namespace: "{{ glance_helm_release_namespace }}"
create_namespace: true
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ glance_helm_kubeconfig }}"
values: "{{ _glance_helm_values | combine(glance_helm_values, recursive=True) }}"
- name: Create Ingress
diff --git a/roles/goldpinger/defaults/main.yml b/roles/goldpinger/defaults/main.yml
index aae6f4b..3acd074 100644
--- a/roles/goldpinger/defaults/main.yml
+++ b/roles/goldpinger/defaults/main.yml
@@ -6,4 +6,5 @@
goldpinger_helm_chart_ref: /usr/local/src/goldpinger
goldpinger_helm_release_namespace: monitoring
+goldpinger_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
goldpinger_helm_values: {}
diff --git a/roles/goldpinger/tasks/main.yml b/roles/goldpinger/tasks/main.yml
index 42c71a3..43e27a1 100644
--- a/roles/goldpinger/tasks/main.yml
+++ b/roles/goldpinger/tasks/main.yml
@@ -8,5 +8,5 @@
chart_ref: "{{ goldpinger_helm_chart_ref }}"
release_namespace: "{{ goldpinger_helm_release_namespace }}"
create_namespace: true
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ goldpinger_helm_kubeconfig }}"
values: "{{ _goldpinger_helm_values | combine(goldpinger_helm_values, recursive=True) }}"
diff --git a/roles/heat/defaults/main.yml b/roles/heat/defaults/main.yml
index 373f377..3ea9ded 100644
--- a/roles/heat/defaults/main.yml
+++ b/roles/heat/defaults/main.yml
@@ -17,6 +17,7 @@
heat_helm_chart_ref: /usr/local/src/heat
heat_helm_release_namespace: openstack
+heat_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
heat_helm_values: {}
heat_ingress_annotations: {}
diff --git a/roles/heat/tasks/main.yml b/roles/heat/tasks/main.yml
index 1418079..96c301a 100644
--- a/roles/heat/tasks/main.yml
+++ b/roles/heat/tasks/main.yml
@@ -19,7 +19,7 @@
chart_ref: "{{ heat_helm_chart_ref }}"
release_namespace: "{{ heat_helm_release_namespace }}"
create_namespace: true
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ heat_helm_kubeconfig }}"
values: "{{ _heat_helm_values | combine(heat_helm_values, recursive=True) }}"
- name: Create Ingress
diff --git a/roles/horizon/defaults/main.yml b/roles/horizon/defaults/main.yml
index acec948..116a87a 100644
--- a/roles/horizon/defaults/main.yml
+++ b/roles/horizon/defaults/main.yml
@@ -17,6 +17,7 @@
horizon_helm_chart_ref: /usr/local/src/horizon
horizon_helm_release_namespace: openstack
+horizon_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
horizon_helm_values: {}
# List of annotations to apply to the Ingress
diff --git a/roles/horizon/tasks/main.yml b/roles/horizon/tasks/main.yml
index 6ef8685..3cd1653 100644
--- a/roles/horizon/tasks/main.yml
+++ b/roles/horizon/tasks/main.yml
@@ -19,7 +19,7 @@
chart_ref: "{{ horizon_helm_chart_ref }}"
release_namespace: "{{ horizon_helm_release_namespace }}"
create_namespace: true
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ horizon_helm_kubeconfig }}"
values: "{{ _horizon_helm_values | combine(horizon_helm_values, recursive=True) }}"
- name: Create Ingress
diff --git a/roles/ingress_nginx/defaults/main.yml b/roles/ingress_nginx/defaults/main.yml
index a441ef6..03684a2 100644
--- a/roles/ingress_nginx/defaults/main.yml
+++ b/roles/ingress_nginx/defaults/main.yml
@@ -17,4 +17,5 @@
ingress_nginx_helm_chart_ref: /usr/local/src/ingress-nginx
ingress_nginx_helm_release_namespace: ingress-nginx
+ingress_nginx_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
ingress_nginx_helm_values: {}
diff --git a/roles/ingress_nginx/tasks/main.yml b/roles/ingress_nginx/tasks/main.yml
index a7b3223..e389f67 100644
--- a/roles/ingress_nginx/tasks/main.yml
+++ b/roles/ingress_nginx/tasks/main.yml
@@ -19,5 +19,5 @@
chart_ref: "{{ ingress_nginx_helm_chart_ref }}"
release_namespace: "{{ ingress_nginx_helm_release_namespace }}"
create_namespace: true
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ ingress_nginx_helm_kubeconfig }}"
values: "{{ _ingress_nginx_helm_values | combine(ingress_nginx_helm_values, recursive=True) }}"
diff --git a/roles/ironic/defaults/main.yml b/roles/ironic/defaults/main.yml
index 158e06b..4df68da 100644
--- a/roles/ironic/defaults/main.yml
+++ b/roles/ironic/defaults/main.yml
@@ -17,6 +17,7 @@
ironic_helm_chart_ref: /usr/local/src/ironic
ironic_helm_release_namespace: openstack
+ironic_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
ironic_helm_values: {}
# List of annotations to apply to the Ingress
diff --git a/roles/ironic/tasks/main.yml b/roles/ironic/tasks/main.yml
index 09cc9c6..bd975f1 100644
--- a/roles/ironic/tasks/main.yml
+++ b/roles/ironic/tasks/main.yml
@@ -83,7 +83,7 @@
chart_ref: "{{ ironic_helm_chart_ref }}"
release_namespace: "{{ ironic_helm_release_namespace }}"
create_namespace: true
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ ironic_helm_kubeconfig }}"
values: "{{ _ironic_helm_values | combine(ironic_helm_values, recursive=True) }}"
- name: Create Ingress
diff --git a/roles/keycloak/defaults/main.yml b/roles/keycloak/defaults/main.yml
index 324ab43..ae1f82b 100644
--- a/roles/keycloak/defaults/main.yml
+++ b/roles/keycloak/defaults/main.yml
@@ -17,6 +17,7 @@
keycloak_helm_chart_ref: /usr/local/src/keycloak
keycloak_helm_release_namespace: auth-system
+keycloak_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
keycloak_helm_values: {}
keycloak_host: "{{ undef('You must specify a Keycloak host using keycloak_host') }}"
diff --git a/roles/keycloak/tasks/main.yml b/roles/keycloak/tasks/main.yml
index f10ffa3..e596d84 100644
--- a/roles/keycloak/tasks/main.yml
+++ b/roles/keycloak/tasks/main.yml
@@ -71,7 +71,7 @@
chart_ref: "{{ keycloak_helm_chart_ref }}"
release_namespace: "{{ keycloak_helm_release_namespace }}"
create_namespace: true
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ keycloak_helm_kubeconfig }}"
wait: true
timeout: 10m
values: "{{ _keycloak_helm_values | combine(keycloak_helm_values, recursive=True) }}"
diff --git a/roles/keystone/defaults/main.yml b/roles/keystone/defaults/main.yml
index 40ca892..f71c59f 100644
--- a/roles/keystone/defaults/main.yml
+++ b/roles/keystone/defaults/main.yml
@@ -17,6 +17,7 @@
keystone_helm_chart_ref: /usr/local/src/keystone
keystone_helm_release_namespace: openstack
+keystone_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
keystone_helm_values: {}
# List of annotations to apply to the Ingress
diff --git a/roles/keystone/tasks/main.yml b/roles/keystone/tasks/main.yml
index df942ec..a35a9ce 100644
--- a/roles/keystone/tasks/main.yml
+++ b/roles/keystone/tasks/main.yml
@@ -67,7 +67,7 @@
chart_ref: "{{ keystone_helm_chart_ref }}"
release_namespace: "{{ keystone_helm_release_namespace }}"
create_namespace: true
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ keystone_helm_kubeconfig }}"
values: "{{ _keystone_helm_values | combine(keystone_helm_values, recursive=True) }}"
- name: Create Ingress
diff --git a/roles/kube_prometheus_stack/defaults/main.yml b/roles/kube_prometheus_stack/defaults/main.yml
index ec15136..db6215c 100644
--- a/roles/kube_prometheus_stack/defaults/main.yml
+++ b/roles/kube_prometheus_stack/defaults/main.yml
@@ -17,6 +17,7 @@
kube_prometheus_stack_helm_chart_ref: /usr/local/src/kube-prometheus-stack
kube_prometheus_stack_helm_release_namespace: monitoring
+kube_prometheus_stack_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
kube_prometheus_stack_helm_values: {}
kube_prometheus_stack_node_exporter_tls_template: "{{ _kube_prometheus_stack_tls_template }}"
diff --git a/roles/kube_prometheus_stack/tasks/main.yml b/roles/kube_prometheus_stack/tasks/main.yml
index 3926eab..87775c4 100644
--- a/roles/kube_prometheus_stack/tasks/main.yml
+++ b/roles/kube_prometheus_stack/tasks/main.yml
@@ -341,5 +341,5 @@
chart_ref: "{{ kube_prometheus_stack_helm_chart_ref }}"
release_namespace: "{{ kube_prometheus_stack_helm_release_namespace }}"
create_namespace: true
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ kube_prometheus_stack_helm_kubeconfig }}"
values: "{{ _kube_prometheus_stack_helm_values | combine(kube_prometheus_stack_helm_values, recursive=True) }}"
diff --git a/roles/libvirt/defaults/main.yml b/roles/libvirt/defaults/main.yml
index 2c2cc40..833fd2c 100644
--- a/roles/libvirt/defaults/main.yml
+++ b/roles/libvirt/defaults/main.yml
@@ -17,4 +17,5 @@
libvirt_helm_chart_ref: /usr/local/src/libvirt
libvirt_helm_release_namespace: openstack
+libvirt_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
libvirt_helm_values: {}
diff --git a/roles/libvirt/tasks/main.yml b/roles/libvirt/tasks/main.yml
index afc37af..adfdfdc 100644
--- a/roles/libvirt/tasks/main.yml
+++ b/roles/libvirt/tasks/main.yml
@@ -61,5 +61,5 @@
chart_ref: "{{ libvirt_helm_chart_ref }}"
release_namespace: "{{ libvirt_helm_release_namespace }}"
create_namespace: true
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ libvirt_helm_kubeconfig }}"
values: "{{ _libvirt_helm_values | combine(libvirt_helm_values, recursive=True) }}"
diff --git a/roles/local_path_provisioner/defaults/main.yml b/roles/local_path_provisioner/defaults/main.yml
index c9cbce7..8d0406e 100644
--- a/roles/local_path_provisioner/defaults/main.yml
+++ b/roles/local_path_provisioner/defaults/main.yml
@@ -17,4 +17,5 @@
local_path_provisioner_helm_chart_ref: /usr/local/src/local-path-provisioner
local_path_provisioner_helm_release_namespace: local-path-storage
+local_path_provisioner_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
local_path_provisioner_helm_values: {}
diff --git a/roles/local_path_provisioner/tasks/main.yml b/roles/local_path_provisioner/tasks/main.yml
index 1554afa..54785ab 100644
--- a/roles/local_path_provisioner/tasks/main.yml
+++ b/roles/local_path_provisioner/tasks/main.yml
@@ -19,5 +19,5 @@
chart_ref: "{{ local_path_provisioner_helm_chart_ref }}"
release_namespace: "{{ local_path_provisioner_helm_release_namespace }}"
create_namespace: true
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ local_path_provisioner_helm_kubeconfig }}"
values: "{{ _local_path_provisioner_helm_values | combine(local_path_provisioner_helm_values, recursive=True) }}"
diff --git a/roles/loki/defaults/main.yml b/roles/loki/defaults/main.yml
index 196238b..3c02c30 100644
--- a/roles/loki/defaults/main.yml
+++ b/roles/loki/defaults/main.yml
@@ -17,4 +17,5 @@
loki_helm_chart_ref: /usr/local/src/loki
loki_helm_release_namespace: monitoring
+loki_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
loki_helm_values: {}
diff --git a/roles/loki/tasks/main.yml b/roles/loki/tasks/main.yml
index 01e2048..bb484a1 100644
--- a/roles/loki/tasks/main.yml
+++ b/roles/loki/tasks/main.yml
@@ -19,5 +19,5 @@
chart_ref: "{{ loki_helm_chart_ref }}"
release_namespace: "{{ loki_helm_release_namespace }}"
create_namespace: true
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ loki_helm_kubeconfig }}"
values: "{{ _loki_helm_values | combine(loki_helm_values, recursive=True) | to_json }}"
diff --git a/roles/magnum/defaults/main.yml b/roles/magnum/defaults/main.yml
index 60cd1a7..05fab12 100644
--- a/roles/magnum/defaults/main.yml
+++ b/roles/magnum/defaults/main.yml
@@ -17,6 +17,7 @@
magnum_helm_chart_ref: /usr/local/src/magnum
magnum_helm_release_namespace: openstack
+magnum_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
magnum_helm_values: {}
# List of annotations to apply to the Ingress
diff --git a/roles/magnum/tasks/main.yml b/roles/magnum/tasks/main.yml
index b9b66cb..fc9b7a0 100644
--- a/roles/magnum/tasks/main.yml
+++ b/roles/magnum/tasks/main.yml
@@ -43,7 +43,7 @@
chart_ref: "{{ magnum_helm_chart_ref }}"
release_namespace: "{{ magnum_helm_release_namespace }}"
create_namespace: true
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ magnum_helm_kubeconfig }}"
values: "{{ _magnum_helm_values | combine(magnum_helm_values, recursive=True) }}"
- name: Deploy "magnum-cluster-api-proxy"
diff --git a/roles/manila/defaults/main.yml b/roles/manila/defaults/main.yml
index b35bb85..d0c66f0 100644
--- a/roles/manila/defaults/main.yml
+++ b/roles/manila/defaults/main.yml
@@ -17,6 +17,7 @@
manila_helm_chart_ref: /usr/local/src/manila
manila_helm_release_namespace: openstack
+manila_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
manila_helm_values: {}
# List of annotations to apply to the Ingress
diff --git a/roles/manila/tasks/main.yml b/roles/manila/tasks/main.yml
index b5f0dd9..8ae97e8 100644
--- a/roles/manila/tasks/main.yml
+++ b/roles/manila/tasks/main.yml
@@ -27,7 +27,7 @@
chart_ref: "{{ manila_helm_chart_ref }}"
release_namespace: "{{ manila_helm_release_namespace }}"
create_namespace: true
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ manila_helm_kubeconfig }}"
values: "{{ _manila_helm_values | combine(manila_helm_values, recursive=True) }}"
- name: Create Ingress
diff --git a/roles/memcached/defaults/main.yml b/roles/memcached/defaults/main.yml
index ce65eca..0ad6697 100644
--- a/roles/memcached/defaults/main.yml
+++ b/roles/memcached/defaults/main.yml
@@ -17,4 +17,5 @@
memcached_helm_chart_ref: /usr/local/src/memcached
memcached_helm_release_namespace: openstack
+memcached_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
memcached_helm_values: {}
diff --git a/roles/memcached/tasks/main.yml b/roles/memcached/tasks/main.yml
index 58c2060..2059a52 100644
--- a/roles/memcached/tasks/main.yml
+++ b/roles/memcached/tasks/main.yml
@@ -19,7 +19,7 @@
chart_ref: "{{ memcached_helm_chart_ref }}"
release_namespace: "{{ memcached_helm_release_namespace }}"
create_namespace: true
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ memcached_helm_kubeconfig }}"
values: "{{ _memcached_helm_values | combine(memcached_helm_values, recursive=True) }}"
- name: Apply manifests for monitoring
diff --git a/roles/neutron/defaults/main.yml b/roles/neutron/defaults/main.yml
index 1cb4215..04d48ac 100644
--- a/roles/neutron/defaults/main.yml
+++ b/roles/neutron/defaults/main.yml
@@ -17,6 +17,7 @@
neutron_helm_chart_ref: /usr/local/src/neutron
neutron_helm_release_namespace: openstack
+neutron_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
neutron_helm_values: {}
# List of networks to provision inside OpenStack
diff --git a/roles/neutron/tasks/main.yml b/roles/neutron/tasks/main.yml
index eabe333..874ed3c 100644
--- a/roles/neutron/tasks/main.yml
+++ b/roles/neutron/tasks/main.yml
@@ -38,7 +38,7 @@
chart_ref: "{{ neutron_helm_chart_ref }}"
release_namespace: "{{ neutron_helm_release_namespace }}"
create_namespace: true
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ neutron_helm_kubeconfig }}"
values: "{{ _neutron_helm_values | combine(neutron_helm_values, recursive=True) }}"
- name: Create Ingress
diff --git a/roles/node_feature_discovery/defaults/main.yml b/roles/node_feature_discovery/defaults/main.yml
index 43124cb..aa7e7ee 100644
--- a/roles/node_feature_discovery/defaults/main.yml
+++ b/roles/node_feature_discovery/defaults/main.yml
@@ -17,4 +17,5 @@
node_feature_discovery_helm_chart_ref: /usr/local/src/node-feature-discovery
node_feature_discovery_helm_release_namespace: monitoring
+node_feature_discovery_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
node_feature_discovery_helm_values: {}
diff --git a/roles/node_feature_discovery/tasks/main.yml b/roles/node_feature_discovery/tasks/main.yml
index 25f8380..a6e316f 100644
--- a/roles/node_feature_discovery/tasks/main.yml
+++ b/roles/node_feature_discovery/tasks/main.yml
@@ -32,5 +32,5 @@
chart_ref: "{{ node_feature_discovery_helm_chart_ref }}"
release_namespace: "{{ node_feature_discovery_helm_release_namespace }}"
create_namespace: true
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ node_feature_discovery_helm_kubeconfig }}"
values: "{{ _node_feature_discovery_helm_values | combine(node_feature_discovery_helm_values, recursive=True) }}"
diff --git a/roles/nova/defaults/main.yml b/roles/nova/defaults/main.yml
index bee46a1..e02faac 100644
--- a/roles/nova/defaults/main.yml
+++ b/roles/nova/defaults/main.yml
@@ -17,6 +17,7 @@
nova_helm_chart_ref: /usr/local/src/nova
nova_helm_release_namespace: openstack
+nova_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
nova_helm_values: {}
# Private SSH key used for cold & live migration
diff --git a/roles/nova/tasks/main.yml b/roles/nova/tasks/main.yml
index 813f042..ed10aa5 100644
--- a/roles/nova/tasks/main.yml
+++ b/roles/nova/tasks/main.yml
@@ -38,7 +38,7 @@
chart_ref: "{{ nova_helm_chart_ref }}"
release_namespace: "{{ nova_helm_release_namespace }}"
create_namespace: true
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ nova_helm_kubeconfig }}"
values: "{{ _nova_helm_values | combine(nova_helm_values, recursive=True) }}"
- name: Create Ingress
diff --git a/roles/octavia/defaults/main.yml b/roles/octavia/defaults/main.yml
index e97c77b..19b31f8 100644
--- a/roles/octavia/defaults/main.yml
+++ b/roles/octavia/defaults/main.yml
@@ -17,6 +17,7 @@
octavia_helm_chart_ref: /usr/local/src/octavia
octavia_helm_release_namespace: openstack
+octavia_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
octavia_helm_values: {}
# List of annotations to apply to the Ingress
diff --git a/roles/octavia/tasks/main.yml b/roles/octavia/tasks/main.yml
index d48a53f..b2c94fd 100644
--- a/roles/octavia/tasks/main.yml
+++ b/roles/octavia/tasks/main.yml
@@ -103,7 +103,7 @@
chart_ref: "{{ octavia_helm_chart_ref }}"
release_namespace: "{{ octavia_helm_release_namespace }}"
create_namespace: true
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ octavia_helm_kubeconfig }}"
values: "{{ _octavia_helm_values | combine(octavia_helm_values, recursive=True) }}"
- name: Add implied roles
diff --git a/roles/openvswitch/defaults/main.yml b/roles/openvswitch/defaults/main.yml
index 52bab4c..e23dc4e 100644
--- a/roles/openvswitch/defaults/main.yml
+++ b/roles/openvswitch/defaults/main.yml
@@ -17,4 +17,5 @@
openvswitch_helm_chart_ref: /usr/local/src/openvswitch
openvswitch_helm_release_namespace: openstack
+openvswitch_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
openvswitch_helm_values: {}
diff --git a/roles/openvswitch/tasks/main.yml b/roles/openvswitch/tasks/main.yml
index 002c6db..0871fb2 100644
--- a/roles/openvswitch/tasks/main.yml
+++ b/roles/openvswitch/tasks/main.yml
@@ -50,5 +50,5 @@
chart_ref: "{{ openvswitch_helm_chart_ref }}"
release_namespace: "{{ openvswitch_helm_release_namespace }}"
create_namespace: true
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ openvswitch_helm_kubeconfig }}"
values: "{{ _openvswitch_helm_values | combine(openvswitch_helm_values, recursive=True) }}"
diff --git a/roles/ovn/defaults/main.yml b/roles/ovn/defaults/main.yml
index a6ebdb9..630a70a 100644
--- a/roles/ovn/defaults/main.yml
+++ b/roles/ovn/defaults/main.yml
@@ -17,6 +17,7 @@
ovn_helm_chart_ref: /usr/local/src/ovn
ovn_helm_release_namespace: openstack
+ovn_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
ovn_helm_values: {}
ovn_network_logging_parser_enabled: true
diff --git a/roles/ovn/tasks/main.yml b/roles/ovn/tasks/main.yml
index 8c9eb37..746205f 100644
--- a/roles/ovn/tasks/main.yml
+++ b/roles/ovn/tasks/main.yml
@@ -20,5 +20,5 @@
chart_ref: "{{ ovn_helm_chart_ref }}"
release_namespace: "{{ ovn_helm_release_namespace }}"
create_namespace: true
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ ovn_helm_kubeconfig }}"
values: "{{ _ovn_helm_values | combine(ovn_helm_values, recursive=True) }}"
diff --git a/roles/percona_xtradb_cluster_operator/defaults/main.yml b/roles/percona_xtradb_cluster_operator/defaults/main.yml
index 67b9b46..676f87b 100644
--- a/roles/percona_xtradb_cluster_operator/defaults/main.yml
+++ b/roles/percona_xtradb_cluster_operator/defaults/main.yml
@@ -17,4 +17,5 @@
percona_xtradb_cluster_operator_helm_chart_ref: /usr/local/src/pxc-operator
percona_xtradb_cluster_operator_helm_release_namespace: openstack
+percona_xtradb_cluster_operator_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
percona_xtradb_cluster_operator_helm_values: {}
diff --git a/roles/percona_xtradb_cluster_operator/tasks/main.yml b/roles/percona_xtradb_cluster_operator/tasks/main.yml
index 25972a0..baf72ed 100644
--- a/roles/percona_xtradb_cluster_operator/tasks/main.yml
+++ b/roles/percona_xtradb_cluster_operator/tasks/main.yml
@@ -19,5 +19,5 @@
chart_ref: "{{ percona_xtradb_cluster_operator_helm_chart_ref }}"
release_namespace: "{{ percona_xtradb_cluster_operator_helm_release_namespace }}"
create_namespace: true
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ percona_xtradb_cluster_operator_helm_kubeconfig }}"
values: "{{ _percona_xtradb_cluster_operator_helm_values | combine(percona_xtradb_cluster_operator_helm_values, recursive=True) }}"
diff --git a/roles/placement/defaults/main.yml b/roles/placement/defaults/main.yml
index ac540b3..bc72b55 100644
--- a/roles/placement/defaults/main.yml
+++ b/roles/placement/defaults/main.yml
@@ -17,6 +17,7 @@
placement_helm_chart_ref: /usr/local/src/placement
placement_helm_release_namespace: openstack
+placement_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
placement_helm_values: {}
# List of annotations to apply to the Ingress
diff --git a/roles/placement/tasks/main.yml b/roles/placement/tasks/main.yml
index 0d664ec..cebee35 100644
--- a/roles/placement/tasks/main.yml
+++ b/roles/placement/tasks/main.yml
@@ -19,7 +19,7 @@
chart_ref: "{{ placement_helm_chart_ref }}"
release_namespace: "{{ placement_helm_release_namespace }}"
create_namespace: true
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ placement_helm_kubeconfig }}"
values: "{{ _placement_helm_values | combine(placement_helm_values, recursive=True) }}"
- name: Create Ingress
diff --git a/roles/powerstore_csi/defaults/main.yaml b/roles/powerstore_csi/defaults/main.yaml
new file mode 100644
index 0000000..c15efd8
--- /dev/null
+++ b/roles/powerstore_csi/defaults/main.yaml
@@ -0,0 +1,4 @@
+# Copyright (c) 2024 VEXXHOST, Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+powerstore_csi_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
diff --git a/roles/powerstore_csi/tasks/main.yml b/roles/powerstore_csi/tasks/main.yml
index 5caec12..1bc2eb6 100644
--- a/roles/powerstore_csi/tasks/main.yml
+++ b/roles/powerstore_csi/tasks/main.yml
@@ -41,7 +41,7 @@
name: csi-powerstore
chart_ref: /var/lib/csi-powerstore/helm/csi-powerstore
release_namespace: kube-system
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ powerstore_csi_helm_kubeconfig }}"
values:
# NOTE(mnaser): The newer versions of the Helm charts automatically detect
# these values so we can drop them once we move to v2.4.0
diff --git a/roles/prometheus_pushgateway/defaults/main.yml b/roles/prometheus_pushgateway/defaults/main.yml
index 1c59998..5e28bf9 100644
--- a/roles/prometheus_pushgateway/defaults/main.yml
+++ b/roles/prometheus_pushgateway/defaults/main.yml
@@ -17,4 +17,5 @@
prometheus_pushgateway_helm_chart_ref: /usr/local/src/prometheus-pushgateway
prometheus_pushgateway_helm_release_namespace: monitoring
+prometheus_pushgateway_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
prometheus_pushgateway_helm_values: {}
diff --git a/roles/prometheus_pushgateway/tasks/main.yml b/roles/prometheus_pushgateway/tasks/main.yml
index 44e6247..67ea3b3 100644
--- a/roles/prometheus_pushgateway/tasks/main.yml
+++ b/roles/prometheus_pushgateway/tasks/main.yml
@@ -19,5 +19,5 @@
chart_ref: "{{ prometheus_pushgateway_helm_chart_ref }}"
release_namespace: "{{ prometheus_pushgateway_helm_release_namespace }}"
create_namespace: true
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ prometheus_pushgateway_helm_kubeconfig }}"
values: "{{ _prometheus_pushgateway_helm_values | combine(prometheus_pushgateway_helm_values, recursive=True) }}"
diff --git a/roles/rabbitmq_cluster_operator/defaults/main.yml b/roles/rabbitmq_cluster_operator/defaults/main.yml
index e376347..972c614 100644
--- a/roles/rabbitmq_cluster_operator/defaults/main.yml
+++ b/roles/rabbitmq_cluster_operator/defaults/main.yml
@@ -17,4 +17,5 @@
rabbitmq_cluster_operator_helm_chart_ref: /usr/local/src/rabbitmq-cluster-operator
rabbitmq_cluster_operator_helm_release_namespace: openstack
+rabbitmq_cluster_operator_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
rabbitmq_cluster_operator_helm_values: {}
diff --git a/roles/rabbitmq_cluster_operator/tasks/main.yml b/roles/rabbitmq_cluster_operator/tasks/main.yml
index 565e797..86c3362 100644
--- a/roles/rabbitmq_cluster_operator/tasks/main.yml
+++ b/roles/rabbitmq_cluster_operator/tasks/main.yml
@@ -35,5 +35,5 @@
chart_ref: "{{ rabbitmq_cluster_operator_helm_chart_ref }}"
release_namespace: "{{ rabbitmq_cluster_operator_helm_release_namespace }}"
create_namespace: true
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ rabbitmq_cluster_operator_helm_kubeconfig }}"
values: "{{ _rabbitmq_cluster_operator_helm_values | combine(rabbitmq_cluster_operator_helm_values, recursive=True) }}"
diff --git a/roles/rook_ceph/defaults/main.yml b/roles/rook_ceph/defaults/main.yml
index 353a381..40247dc 100644
--- a/roles/rook_ceph/defaults/main.yml
+++ b/roles/rook_ceph/defaults/main.yml
@@ -17,4 +17,5 @@
rook_ceph_helm_chart_ref: /usr/local/src/rook-ceph
rook_ceph_helm_release_namespace: rook-ceph
+rook_ceph_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
rook_ceph_helm_values: {}
diff --git a/roles/rook_ceph/tasks/main.yml b/roles/rook_ceph/tasks/main.yml
index f389411..b172e37 100644
--- a/roles/rook_ceph/tasks/main.yml
+++ b/roles/rook_ceph/tasks/main.yml
@@ -19,5 +19,5 @@
chart_ref: "{{ rook_ceph_helm_chart_ref }}"
release_namespace: "{{ rook_ceph_helm_release_namespace }}"
create_namespace: true
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ rook_ceph_helm_kubeconfig }}"
values: "{{ _rook_ceph_helm_values | combine(rook_ceph_helm_values, recursive=True) }}"
diff --git a/roles/rook_ceph_cluster/defaults/main.yml b/roles/rook_ceph_cluster/defaults/main.yml
index b582e44..4c2545b 100644
--- a/roles/rook_ceph_cluster/defaults/main.yml
+++ b/roles/rook_ceph_cluster/defaults/main.yml
@@ -19,6 +19,7 @@
rook_ceph_cluster_helm_chart_ref: /usr/local/src/rook-ceph-cluster
rook_ceph_cluster_helm_release_namespace: openstack
+rook_ceph_cluster_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
rook_ceph_cluster_helm_values: {}
# List of annotations to apply to the Ingress
diff --git a/roles/rook_ceph_cluster/tasks/main.yml b/roles/rook_ceph_cluster/tasks/main.yml
index 39675d7..206d364 100644
--- a/roles/rook_ceph_cluster/tasks/main.yml
+++ b/roles/rook_ceph_cluster/tasks/main.yml
@@ -86,7 +86,7 @@
chart_ref: "{{ rook_ceph_cluster_helm_chart_ref }}"
release_namespace: "{{ rook_ceph_cluster_helm_release_namespace }}"
create_namespace: true
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ rook_ceph_cluster_helm_kubeconfig }}"
values: "{{ _rook_ceph_cluster_helm_values | combine(rook_ceph_cluster_helm_values, recursive=True) }}"
- name: Create OpenStack user
diff --git a/roles/staffeln/defaults/main.yaml b/roles/staffeln/defaults/main.yaml
index 62c30f0..04f9eaa 100644
--- a/roles/staffeln/defaults/main.yaml
+++ b/roles/staffeln/defaults/main.yaml
@@ -17,6 +17,8 @@
staffeln_helm_chart_ref: /usr/local/src/staffeln
staffeln_helm_release_namespace: openstack
+staffeln_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
staffeln_helm_values: {}
+
staffeln_backup_metadata_key: "__staffeln_backup"
staffeln_retention_metadata_key: "__staffeln_retention"
diff --git a/roles/staffeln/tasks/main.yaml b/roles/staffeln/tasks/main.yaml
index 7e055f3..4b53b5c 100644
--- a/roles/staffeln/tasks/main.yaml
+++ b/roles/staffeln/tasks/main.yaml
@@ -19,5 +19,5 @@
chart_ref: "{{ staffeln_helm_chart_ref }}"
release_namespace: "{{ staffeln_helm_release_namespace }}"
create_namespace: true
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ staffeln_helm_kubeconfig }}"
values: "{{ _staffeln_helm_values | combine(staffeln_helm_values, recursive=True) }}"
diff --git a/roles/tempest/defaults/main.yml b/roles/tempest/defaults/main.yml
index 56b4eba..e7e5bfc 100644
--- a/roles/tempest/defaults/main.yml
+++ b/roles/tempest/defaults/main.yml
@@ -17,4 +17,5 @@
tempest_helm_chart_ref: /usr/local/src/tempest
tempest_helm_release_namespace: openstack
+tempest_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
tempest_helm_values: {}
diff --git a/roles/tempest/tasks/main.yml b/roles/tempest/tasks/main.yml
index 833cda7..8ea8e8f 100644
--- a/roles/tempest/tasks/main.yml
+++ b/roles/tempest/tasks/main.yml
@@ -84,7 +84,7 @@
name: "{{ tempest_helm_release_name }}"
chart_ref: "{{ tempest_helm_chart_ref }}"
release_namespace: "{{ tempest_helm_release_namespace }}"
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ tempest_helm_kubeconfig }}"
values: "{{ _tempest_helm_values | combine(_tempest_network_backend_settings[atmosphere_network_backend], recursive=True) | combine(tempest_helm_values, recursive=True) }}" # noqa: yaml[line-length]
wait: true
wait_timeout: 20m
diff --git a/roles/vector/defaults/main.yml b/roles/vector/defaults/main.yml
index 0ce0ff9..6a1966f 100644
--- a/roles/vector/defaults/main.yml
+++ b/roles/vector/defaults/main.yml
@@ -17,4 +17,5 @@
vector_helm_chart_ref: /usr/local/src/vector
vector_helm_release_namespace: monitoring
+vector_helm_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
vector_helm_values: {}
diff --git a/roles/vector/tasks/main.yml b/roles/vector/tasks/main.yml
index ec5eb59..fabbab4 100644
--- a/roles/vector/tasks/main.yml
+++ b/roles/vector/tasks/main.yml
@@ -19,5 +19,5 @@
chart_ref: "{{ vector_helm_chart_ref }}"
release_namespace: "{{ vector_helm_release_namespace }}"
create_namespace: true
- kubeconfig: /etc/kubernetes/admin.conf
+ kubeconfig: "{{ vector_helm_kubeconfig }}"
values: "{{ _vector_helm_values | combine(vector_helm_values, recursive=True) }}"