Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add optional kubeconfig path to roles #1871

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,5 @@ collections/
[._]*.un~
Session.vim
Sessionx.vim

.venv
1 change: 1 addition & 0 deletions roles/barbican/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ barbican_helm_values: {}
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: /etc/kubernetes/admin.conf
kubeconfig: "{{ barbican_kubeconfig }}"
values: "{{ _barbican_helm_values | combine(barbican_helm_values, recursive=True) }}"

- name: Create Ingress
Expand Down
2 changes: 2 additions & 0 deletions roles/ceph_csi_rbd/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,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_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: /etc/kubernetes/admin.conf
kubeconfig: "{{ ceph_csi_kubeconfig }}"
values: "{{ _ceph_csi_rbd_helm_values | combine(ceph_csi_rbd_helm_values, recursive=True) }}"
2 changes: 2 additions & 0 deletions roles/ceph_provisioners/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,5 @@ ceph_provisioners_ceph_cluster_network: "{{ ceph_provisioners_ceph_public_networ

# 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: /etc/kubernetes/admin.conf
kubeconfig: "{{ ceph_provisioners_kubeconfig }}"
values: "{{ _ceph_provisioners_helm_values | combine(ceph_provisioners_helm_values, recursive=True) }}"
2 changes: 2 additions & 0 deletions roles/cinder/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@ 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: /etc/kubernetes/admin.conf
kubeconfig: "{{ cinder_kubeconfig }}"
values: "{{ _cinder_helm_values | combine(cinder_helm_values, recursive=True) }}"

- name: Create Ingress
Expand Down
9 changes: 9 additions & 0 deletions roles/cluster_issuer/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,12 @@ cluster_issuer_ca_secret_name: cert-manager-issuer-ca

cluster_issuer_self_signed_certificate_name: self-signed-ca
cluster_issuer_self_signed_secret_name: cert-manager-selfsigned-ca

cluster_issuer_acme_azuredns_secret_name: cert-manager-issuer-azuredns-credentials
cluster_issuer_acme_azuredns_environment: AzurePublicCloud
# cluster_issuer_acme_azuredns_client_id:
# cluster_issuer_acme_azuredns_client_secret:
# cluster_issuer_acme_azuredns_subscription_id:
# cluster_issuer_acme_azuredns_tenant_id:
# cluster_issuer_acme_azuredns_resourcegroup_name:
# cluster_issuer_acme_azuredns_hostedzone_name:
2 changes: 2 additions & 0 deletions roles/coredns/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ coredns_helm_chart_ref: /usr/local/src/coredns

coredns_helm_release_namespace: openstack
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: /etc/kubernetes/admin.conf
kubeconfig: "{{ coredns_kubeconfig }}"
values: "{{ _coredns_helm_values | combine(coredns_helm_values, recursive=True) }}"
2 changes: 2 additions & 0 deletions roles/designate/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,5 @@ 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: /etc/kubernetes/admin.conf
kubeconfig: "{{ designate_kubeconfig }}"
values: "{{ _designate_helm_values | combine(designate_helm_values, recursive=True) }}"

- name: Create Ingress
Expand Down
2 changes: 2 additions & 0 deletions roles/glance/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,5 @@ 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: /etc/kubernetes/admin.conf
kubeconfig: "{{ glance_kubeconfig }}"
values: "{{ _glance_helm_values | combine(glance_helm_values, recursive=True) }}"

- name: Create Ingress
Expand Down
2 changes: 2 additions & 0 deletions roles/goldpinger/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@ goldpinger_helm_chart_ref: /usr/local/src/goldpinger

goldpinger_helm_release_namespace: monitoring
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: /etc/kubernetes/admin.conf
kubeconfig: "{{ goldpinger_kubeconfig }}"
values: "{{ _goldpinger_helm_values | combine(goldpinger_helm_values, recursive=True) }}"
2 changes: 2 additions & 0 deletions roles/heat/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,5 @@ 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: /etc/kubernetes/admin.conf
kubeconfig: "{{ heat_kubeconfig }}"
values: "{{ _heat_helm_values | combine(heat_helm_values, recursive=True) }}"

- name: Create Ingress
Expand Down
2 changes: 2 additions & 0 deletions roles/horizon/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@ 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: /etc/kubernetes/admin.conf
kubeconfig: "{{ horizon_kubeconfig }}"
values: "{{ _horizon_helm_values | combine(horizon_helm_values, recursive=True) }}"

- name: Create Ingress
Expand Down
2 changes: 2 additions & 0 deletions roles/ingress_nginx/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ ingress_nginx_helm_chart_ref: /usr/local/src/ingress-nginx

ingress_nginx_helm_release_namespace: ingress-nginx
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: /etc/kubernetes/admin.conf
kubeconfig: "{{ ingress_nginx_kubeconfig }}"
values: "{{ _ingress_nginx_helm_values | combine(ingress_nginx_helm_values, recursive=True) }}"
2 changes: 2 additions & 0 deletions roles/ironic/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,5 @@ 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: /etc/kubernetes/admin.conf
kubeconfig: "{{ ironic_kubeconfig }}"
values: "{{ _ironic_helm_values | combine(ironic_helm_values, recursive=True) }}"

- name: Create Ingress
Expand Down
2 changes: 2 additions & 0 deletions roles/keycloak/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,5 @@ 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: /etc/kubernetes/admin.conf
kubeconfig: "{{ keycloak_kubeconfig }}"
wait: true
timeout: 10m
values: "{{ _keycloak_helm_values | combine(keycloak_helm_values, recursive=True) }}"
Expand Down
2 changes: 2 additions & 0 deletions roles/keystone/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,5 @@ 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: /etc/kubernetes/admin.conf
kubeconfig: "{{ keystone_kubeconfig }}"
values: "{{ _keystone_helm_values | combine(keystone_helm_values, recursive=True) }}"

- name: Create Ingress
Expand Down
2 changes: 2 additions & 0 deletions roles/kube_prometheus_stack/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,5 @@ 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: /etc/kubernetes/admin.conf
kubeconfig: "{{ kube_prometheus_stack_kubeconfig }}"
values: "{{ _kube_prometheus_stack_helm_values | combine(kube_prometheus_stack_helm_values, recursive=True) }}"
2 changes: 2 additions & 0 deletions roles/libvirt/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ libvirt_helm_chart_ref: /usr/local/src/libvirt

libvirt_helm_release_namespace: openstack
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: /etc/kubernetes/admin.conf
kubeconfig: "{{ libvirt_kubeconfig }}"
values: "{{ _libvirt_helm_values | combine(libvirt_helm_values, recursive=True) }}"
2 changes: 2 additions & 0 deletions roles/local_path_provisioner/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,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_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: /etc/kubernetes/admin.conf
kubeconfig: "{{ local_path_provisioner_kubeconfig }}"
values: "{{ _local_path_provisioner_helm_values | combine(local_path_provisioner_helm_values, recursive=True) }}"
2 changes: 2 additions & 0 deletions roles/loki/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ loki_helm_chart_ref: /usr/local/src/loki

loki_helm_release_namespace: monitoring
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: /etc/kubernetes/admin.conf
kubeconfig: "{{ loki_kubeconfig }}"
values: "{{ _loki_helm_values | combine(loki_helm_values, recursive=True) | to_json }}"
2 changes: 2 additions & 0 deletions roles/magnum/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,5 @@ 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: /etc/kubernetes/admin.conf
kubeconfig: "{{ magnum_kubeconfig }}"
values: "{{ _magnum_helm_values | combine(magnum_helm_values, recursive=True) }}"

- name: Deploy "magnum-cluster-api-proxy"
Expand Down
2 changes: 2 additions & 0 deletions roles/manila/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,5 @@ 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: /etc/kubernetes/admin.conf
kubeconfig: "{{ manila_kubeconfig }}"
values: "{{ _manila_helm_values | combine(manila_helm_values, recursive=True) }}"

- name: Create Ingress
Expand Down
2 changes: 2 additions & 0 deletions roles/memcached/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ memcached_helm_chart_ref: /usr/local/src/memcached

memcached_helm_release_namespace: openstack
memcached_helm_values: {}

memcached_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
2 changes: 1 addition & 1 deletion roles/memcached/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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_kubeconfig }}"
values: "{{ _memcached_helm_values | combine(memcached_helm_values, recursive=True) }}"

- name: Apply manifests for monitoring
Expand Down
2 changes: 2 additions & 0 deletions roles/neutron/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,5 @@ neutron_designate_integration_enabled: false
# Enable neutron policy server to force external
# policy check neutron port and address pairs actions.
neutron_policy_server_integration_enabled: true

neutron_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
2 changes: 1 addition & 1 deletion roles/neutron/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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_kubeconfig }}"
values: "{{ _neutron_helm_values | combine(neutron_helm_values, recursive=True) }}"

- name: Create Ingress
Expand Down
2 changes: 2 additions & 0 deletions roles/node_feature_discovery/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ node_feature_discovery_helm_chart_ref: /usr/local/src/node-feature-discovery

node_feature_discovery_helm_release_namespace: monitoring
node_feature_discovery_helm_values: {}

node_feature_discovery_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
2 changes: 1 addition & 1 deletion roles/node_feature_discovery/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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_kubeconfig }}"
values: "{{ _node_feature_discovery_helm_values | combine(node_feature_discovery_helm_values, recursive=True) }}"
2 changes: 2 additions & 0 deletions roles/nova/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ nova_flavors: []
# List of annotations to apply to the Ingress
nova_api_ingress_annotations: {}
nova_novnc_ingress_annotations: {}

nova_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
2 changes: 1 addition & 1 deletion roles/nova/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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_kubeconfig }}"
values: "{{ _nova_helm_values | combine(nova_helm_values, recursive=True) }}"

- name: Create Ingress
Expand Down
2 changes: 2 additions & 0 deletions roles/octavia/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,5 @@ octavia_amphora_image_container_format: bare
octavia_amphora_image_disk_format: raw
octavia_amphora_image_tags:
- amphora

octavia_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
2 changes: 1 addition & 1 deletion roles/octavia/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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_kubeconfig }}"
values: "{{ _octavia_helm_values | combine(octavia_helm_values, recursive=True) }}"

- name: Add implied roles
Expand Down
2 changes: 2 additions & 0 deletions roles/openvswitch/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ openvswitch_helm_chart_ref: /usr/local/src/openvswitch

openvswitch_helm_release_namespace: openstack
openvswitch_helm_values: {}

openvswitch_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
2 changes: 1 addition & 1 deletion roles/openvswitch/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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_kubeconfig }}"
values: "{{ _openvswitch_helm_values | combine(openvswitch_helm_values, recursive=True) }}"
2 changes: 2 additions & 0 deletions roles/ovn/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,5 @@ ovn_helm_release_namespace: openstack
ovn_helm_values: {}

ovn_network_logging_parser_enabled: true

ovn_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}"
2 changes: 1 addition & 1 deletion roles/ovn/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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_kubeconfig }}"
values: "{{ _ovn_helm_values | combine(ovn_helm_values, recursive=True) }}"
Loading