Skip to content

Commit

Permalink
Refactor variable names to follow convention
Browse files Browse the repository at this point in the history
  • Loading branch information
mnaser authored and vexxhost-bot committed Sep 25, 2024
1 parent 7eb4fbf commit 4f248bc
Show file tree
Hide file tree
Showing 74 changed files with 78 additions and 112 deletions.
2 changes: 1 addition & 1 deletion roles/barbican/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ barbican_helm_chart_path: "../../charts/barbican/"
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
barbican_ingress_annotations: {}
# Barbican key encryption key
barbican_kek: "{{ undef(hint='You must specify a Barbican key encryption key') }}"
barbican_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
2 changes: 1 addition & 1 deletion roles/barbican/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
chart_ref: "{{ barbican_helm_chart_ref }}"
release_namespace: "{{ barbican_helm_release_namespace }}"
create_namespace: true
kubeconfig: "{{ barbican_kubeconfig }}"
kubeconfig: "{{ barbican_helm_kubeconfig }}"
values: "{{ _barbican_helm_values | combine(barbican_helm_values, recursive=True) }}"

- name: Create Ingress
Expand Down
3 changes: 1 addition & 2 deletions roles/ceph_csi_rbd/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,5 @@ ceph_csi_rbd_helm_chart_path: "../../charts/ceph-csi-rbd/"
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: {}

ceph_csi_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
2 changes: 1 addition & 1 deletion roles/ceph_csi_rbd/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,5 +65,5 @@
chart_ref: "{{ ceph_csi_rbd_helm_chart_ref }}"
release_namespace: "{{ ceph_csi_rbd_helm_release_namespace }}"
create_namespace: true
kubeconfig: "{{ ceph_csi_kubeconfig }}"
kubeconfig: "{{ ceph_csi_rbd_helm_kubeconfig }}"
values: "{{ _ceph_csi_rbd_helm_values | combine(ceph_csi_rbd_helm_values, recursive=True) }}"
6 changes: 1 addition & 5 deletions roles/ceph_provisioners/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ ceph_provisioners_helm_chart_path: "../../charts/ceph-provisioners/"
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.
Expand All @@ -27,8 +28,3 @@ ceph_provisioners_ceph_public_network: "{{ ceph_mon_public_network }}"

# Cluster (replication) network used by Ceph
ceph_provisioners_ceph_cluster_network: "{{ ceph_provisioners_ceph_public_network }}"

# Overrides for Helm chart values
ceph_provisioners_values: {}

ceph_provisioners_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
2 changes: 1 addition & 1 deletion roles/ceph_provisioners/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,5 +112,5 @@
chart_ref: "{{ ceph_provisioners_helm_chart_ref }}"
release_namespace: "{{ ceph_provisioners_helm_release_namespace }}"
create_namespace: true
kubeconfig: "{{ ceph_provisioners_kubeconfig }}"
kubeconfig: "{{ ceph_provisioners_helm_kubeconfig }}"
values: "{{ _ceph_provisioners_helm_values | combine(ceph_provisioners_helm_values, recursive=True) }}"
3 changes: 1 addition & 2 deletions roles/cinder/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@ cinder_helm_chart_path: "../../charts/cinder/"
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
cinder_ingress_annotations: {}

cinder_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
2 changes: 1 addition & 1 deletion roles/cinder/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
chart_ref: "{{ cinder_helm_chart_ref }}"
release_namespace: "{{ cinder_helm_release_namespace }}"
create_namespace: true
kubeconfig: "{{ cinder_kubeconfig }}"
kubeconfig: "{{ cinder_helm_kubeconfig }}"
values: "{{ _cinder_helm_values | combine(cinder_helm_values, recursive=True) }}"

- name: Create Ingress
Expand Down
3 changes: 1 addition & 2 deletions roles/coredns/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,5 @@ coredns_helm_chart_path: "../../charts/coredns/"
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: {}

coredns_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
2 changes: 1 addition & 1 deletion roles/coredns/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@
chart_ref: "{{ coredns_helm_chart_ref }}"
release_namespace: "{{ coredns_helm_release_namespace }}"
create_namespace: true
kubeconfig: "{{ coredns_kubeconfig }}"
kubeconfig: "{{ coredns_helm_kubeconfig }}"
values: "{{ _coredns_helm_values | combine(coredns_helm_values, recursive=True) }}"
3 changes: 1 addition & 2 deletions roles/designate/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,11 @@ designate_helm_chart_path: "../../charts/designate/"
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
designate_ingress_annotations: {}

# Pools definition
designate_pools: ""

designate_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
2 changes: 1 addition & 1 deletion roles/designate/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
chart_ref: "{{ designate_helm_chart_ref }}"
release_namespace: "{{ designate_helm_release_namespace }}"
create_namespace: true
kubeconfig: "{{ designate_kubeconfig }}"
kubeconfig: "{{ designate_helm_kubeconfig }}"
values: "{{ _designate_helm_values | combine(designate_helm_values, recursive=True) }}"

- name: Create Ingress
Expand Down
3 changes: 1 addition & 2 deletions roles/glance/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,11 @@ glance_helm_chart_path: "../../charts/glance/"
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
glance_ingress_annotations: {}

# List of images to provision inside OpenStack
glance_images: []

glance_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
2 changes: 1 addition & 1 deletion roles/glance/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
chart_ref: "{{ glance_helm_chart_ref }}"
release_namespace: "{{ glance_helm_release_namespace }}"
create_namespace: true
kubeconfig: "{{ glance_kubeconfig }}"
kubeconfig: "{{ glance_helm_kubeconfig }}"
values: "{{ _glance_helm_values | combine(glance_helm_values, recursive=True) }}"

- name: Create Ingress
Expand Down
3 changes: 1 addition & 2 deletions roles/goldpinger/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@ goldpinger_helm_chart_path: "../../charts/goldpinger/"
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: {}

goldpinger_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
2 changes: 1 addition & 1 deletion roles/goldpinger/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
chart_ref: "{{ goldpinger_helm_chart_ref }}"
release_namespace: "{{ goldpinger_helm_release_namespace }}"
create_namespace: true
kubeconfig: "{{ goldpinger_kubeconfig }}"
kubeconfig: "{{ goldpinger_helm_kubeconfig }}"
values: "{{ _goldpinger_helm_values | combine(goldpinger_helm_values, recursive=True) }}"
3 changes: 1 addition & 2 deletions roles/heat/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,10 @@ heat_helm_chart_path: "../../charts/heat/"
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: {}

# Encryption key for Heat to use for encrypting sensitive data
heat_auth_encryption_key: "{{ undef(hint='You must specifiy an encryption key for Heat.') }}"

heat_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
2 changes: 1 addition & 1 deletion roles/heat/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
chart_ref: "{{ heat_helm_chart_ref }}"
release_namespace: "{{ heat_helm_release_namespace }}"
create_namespace: true
kubeconfig: "{{ heat_kubeconfig }}"
kubeconfig: "{{ heat_helm_kubeconfig }}"
values: "{{ _heat_helm_values | combine(heat_helm_values, recursive=True) }}"

- name: Create Ingress
Expand Down
3 changes: 1 addition & 2 deletions roles/horizon/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@ horizon_helm_chart_path: "../../charts/horizon/"
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
horizon_ingress_annotations: {}

horizon_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
2 changes: 1 addition & 1 deletion roles/horizon/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
chart_ref: "{{ horizon_helm_chart_ref }}"
release_namespace: "{{ horizon_helm_release_namespace }}"
create_namespace: true
kubeconfig: "{{ horizon_kubeconfig }}"
kubeconfig: "{{ horizon_helm_kubeconfig }}"
values: "{{ _horizon_helm_values | combine(horizon_helm_values, recursive=True) }}"

- name: Create Ingress
Expand Down
3 changes: 1 addition & 2 deletions roles/ingress_nginx/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,5 @@ ingress_nginx_helm_chart_path: "../../charts/ingress-nginx/"
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: {}

ingress_nginx_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
2 changes: 1 addition & 1 deletion roles/ingress_nginx/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@
chart_ref: "{{ ingress_nginx_helm_chart_ref }}"
release_namespace: "{{ ingress_nginx_helm_release_namespace }}"
create_namespace: true
kubeconfig: "{{ ingress_nginx_kubeconfig }}"
kubeconfig: "{{ ingress_nginx_helm_kubeconfig }}"
values: "{{ _ingress_nginx_helm_values | combine(ingress_nginx_helm_values, recursive=True) }}"
3 changes: 1 addition & 2 deletions roles/ironic/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ ironic_helm_chart_path: "../../charts/ironic/"
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
Expand All @@ -36,5 +37,3 @@ ironic_python_agent_deploy_kernel_name: ipa-centos9-zed.kernel
ironic_python_agent_deploy_kernel_url: https://tarballs.opendev.org/openstack/ironic-python-agent/dib/files/ipa-centos9-stable-zed.kernel
ironic_python_agent_deploy_ramdisk_name: ipa-centos9-zed.initramfs
ironic_python_agent_deploy_ramdisk_url: https://tarballs.opendev.org/openstack/ironic-python-agent/dib/files/ipa-centos9-stable-zed.initramfs

ironic_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
2 changes: 1 addition & 1 deletion roles/ironic/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
chart_ref: "{{ ironic_helm_chart_ref }}"
release_namespace: "{{ ironic_helm_release_namespace }}"
create_namespace: true
kubeconfig: "{{ ironic_kubeconfig }}"
kubeconfig: "{{ ironic_helm_kubeconfig }}"
values: "{{ _ironic_helm_values | combine(ironic_helm_values, recursive=True) }}"

- name: Create Ingress
Expand Down
3 changes: 1 addition & 2 deletions roles/keycloak/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ keycloak_helm_chart_path: "../../charts/keycloak/"
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') }}"
Expand All @@ -31,5 +32,3 @@ keycloak_database_username: keycloak
keycloak_database_password: "{{ undef('You must specify a Keycloak database password using keycloak_database_password') }}"
keycloak_database_name: keycloak
keycloak_host_tls_secret_name: "{{ openstack_helm_ingress_secret_name | default(keycloak_host + '-tls')}}"

keycloak_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
2 changes: 1 addition & 1 deletion roles/keycloak/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
chart_ref: "{{ keycloak_helm_chart_ref }}"
release_namespace: "{{ keycloak_helm_release_namespace }}"
create_namespace: true
kubeconfig: "{{ keycloak_kubeconfig }}"
kubeconfig: "{{ keycloak_helm_kubeconfig }}"
wait: true
timeout: 10m
values: "{{ _keycloak_helm_values | combine(keycloak_helm_values, recursive=True) }}"
Expand Down
3 changes: 1 addition & 2 deletions roles/keystone/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ keystone_helm_chart_path: "../../charts/keystone/"
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
Expand Down Expand Up @@ -61,5 +62,3 @@ keystone_oidc_redirect_uri: "https://{{ openstack_helm_endpoints_keystone_api_ho
keystone_oidc_redirect_urls_allowed:
- "^https://{{ openstack_helm_endpoints_keystone_api_host }}/v3/auth/OS-FEDERATION/identity_providers/({{ keystone_domains | map(attribute='name') | join('|') }})/protocols/openid/websso" # noqa: yaml[line-length]
- "^https://{{ openstack_helm_endpoints_horizon_api_host }}/auth/logout/$"

keystone_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
2 changes: 1 addition & 1 deletion roles/keystone/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
chart_ref: "{{ keystone_helm_chart_ref }}"
release_namespace: "{{ keystone_helm_release_namespace }}"
create_namespace: true
kubeconfig: "{{ keystone_kubeconfig }}"
kubeconfig: "{{ keystone_helm_kubeconfig }}"
values: "{{ _keystone_helm_values | combine(keystone_helm_values, recursive=True) }}"

- name: Create Ingress
Expand Down
3 changes: 1 addition & 2 deletions roles/kube_prometheus_stack/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ kube_prometheus_stack_helm_chart_path: "../../charts/kube-prometheus-stack/"
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 }}"
Expand Down Expand Up @@ -77,5 +78,3 @@ kube_prometheus_stack_keycloak_clients:
oauth2_proxy: true
redirect_uris:
- "https://{{ kube_prometheus_stack_prometheus_host }}/oauth2/callback"

kube_prometheus_stack_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
2 changes: 1 addition & 1 deletion roles/kube_prometheus_stack/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -341,5 +341,5 @@
chart_ref: "{{ kube_prometheus_stack_helm_chart_ref }}"
release_namespace: "{{ kube_prometheus_stack_helm_release_namespace }}"
create_namespace: true
kubeconfig: "{{ kube_prometheus_stack_kubeconfig }}"
kubeconfig: "{{ kube_prometheus_stack_helm_kubeconfig }}"
values: "{{ _kube_prometheus_stack_helm_values | combine(kube_prometheus_stack_helm_values, recursive=True) }}"
3 changes: 1 addition & 2 deletions roles/libvirt/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,5 @@ libvirt_helm_chart_path: "../../charts/libvirt/"
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: {}

libvirt_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
2 changes: 1 addition & 1 deletion roles/libvirt/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,5 @@
chart_ref: "{{ libvirt_helm_chart_ref }}"
release_namespace: "{{ libvirt_helm_release_namespace }}"
create_namespace: true
kubeconfig: "{{ libvirt_kubeconfig }}"
kubeconfig: "{{ libvirt_helm_kubeconfig }}"
values: "{{ _libvirt_helm_values | combine(libvirt_helm_values, recursive=True) }}"
3 changes: 1 addition & 2 deletions roles/local_path_provisioner/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,5 @@ local_path_provisioner_helm_chart_path: "../../charts/local-path-provisioner/"
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: {}

local_path_provisioner_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
2 changes: 1 addition & 1 deletion roles/local_path_provisioner/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@
chart_ref: "{{ local_path_provisioner_helm_chart_ref }}"
release_namespace: "{{ local_path_provisioner_helm_release_namespace }}"
create_namespace: true
kubeconfig: "{{ local_path_provisioner_kubeconfig }}"
kubeconfig: "{{ local_path_provisioner_helm_kubeconfig }}"
values: "{{ _local_path_provisioner_helm_values | combine(local_path_provisioner_helm_values, recursive=True) }}"
3 changes: 1 addition & 2 deletions roles/loki/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,5 @@ loki_helm_chart_path: "../../charts/loki/"
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: {}

loki_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
2 changes: 1 addition & 1 deletion roles/loki/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@
chart_ref: "{{ loki_helm_chart_ref }}"
release_namespace: "{{ loki_helm_release_namespace }}"
create_namespace: true
kubeconfig: "{{ loki_kubeconfig }}"
kubeconfig: "{{ loki_helm_kubeconfig }}"
values: "{{ _loki_helm_values | combine(loki_helm_values, recursive=True) | to_json }}"
3 changes: 1 addition & 2 deletions roles/magnum/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ magnum_helm_chart_path: "../../charts/magnum/"
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
Expand Down Expand Up @@ -57,5 +58,3 @@ magnum_cluster_api_proxy_ovs_node_selector:
openstack-control-plane: enabled
magnum_cluster_api_proxy_ovn_node_selector:
openvswitch: enabled

magnum_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
2 changes: 1 addition & 1 deletion roles/magnum/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
chart_ref: "{{ magnum_helm_chart_ref }}"
release_namespace: "{{ magnum_helm_release_namespace }}"
create_namespace: true
kubeconfig: "{{ magnum_kubeconfig }}"
kubeconfig: "{{ magnum_helm_kubeconfig }}"
values: "{{ _magnum_helm_values | combine(magnum_helm_values, recursive=True) }}"

- name: Deploy "magnum-cluster-api-proxy"
Expand Down
3 changes: 1 addition & 2 deletions roles/manila/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ manila_helm_chart_path: "../../charts/manila/"
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
Expand All @@ -37,5 +38,3 @@ manila_image_disk_format: qcow2

# Service instance authentication
manila_ssh_key: "{{ undef('You must provide a private SSH key using manila_ssh_key') }}"

manila_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
2 changes: 1 addition & 1 deletion roles/manila/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
chart_ref: "{{ manila_helm_chart_ref }}"
release_namespace: "{{ manila_helm_release_namespace }}"
create_namespace: true
kubeconfig: "{{ manila_kubeconfig }}"
kubeconfig: "{{ manila_helm_kubeconfig }}"
values: "{{ _manila_helm_values | combine(manila_helm_values, recursive=True) }}"

- name: Create Ingress
Expand Down
Loading

0 comments on commit 4f248bc

Please sign in to comment.