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

Merged
Merged
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
1 change: 1 addition & 0 deletions roles/barbican/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ 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
Expand Down
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_helm_kubeconfig }}"
values: "{{ _barbican_helm_values | combine(barbican_helm_values, recursive=True) }}"

- name: Create Ingress
Expand Down
1 change: 1 addition & 0 deletions roles/ceph_csi_rbd/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +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: {}
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_rbd_helm_kubeconfig }}"
values: "{{ _ceph_csi_rbd_helm_values | combine(ceph_csi_rbd_helm_values, recursive=True) }}"
4 changes: 1 addition & 3 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,6 +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: {}
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_helm_kubeconfig }}"
values: "{{ _ceph_provisioners_helm_values | combine(ceph_provisioners_helm_values, recursive=True) }}"
1 change: 1 addition & 0 deletions roles/cinder/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ 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
Expand Down
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_helm_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:
1 change: 1 addition & 0 deletions roles/coredns/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +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: {}
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_helm_kubeconfig }}"
values: "{{ _coredns_helm_values | combine(coredns_helm_values, recursive=True) }}"
1 change: 1 addition & 0 deletions roles/designate/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ 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
Expand Down
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_helm_kubeconfig }}"
values: "{{ _designate_helm_values | combine(designate_helm_values, recursive=True) }}"

- name: Create Ingress
Expand Down
1 change: 1 addition & 0 deletions roles/glance/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ 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
Expand Down
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_helm_kubeconfig }}"
values: "{{ _glance_helm_values | combine(glance_helm_values, recursive=True) }}"

- name: Create Ingress
Expand Down
1 change: 1 addition & 0 deletions roles/goldpinger/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +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: {}
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_helm_kubeconfig }}"
values: "{{ _goldpinger_helm_values | combine(goldpinger_helm_values, recursive=True) }}"
1 change: 1 addition & 0 deletions roles/heat/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ 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: {}
Expand Down
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_helm_kubeconfig }}"
values: "{{ _heat_helm_values | combine(heat_helm_values, recursive=True) }}"

- name: Create Ingress
Expand Down
1 change: 1 addition & 0 deletions roles/horizon/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ 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
Expand Down
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_helm_kubeconfig }}"
values: "{{ _horizon_helm_values | combine(horizon_helm_values, recursive=True) }}"

- name: Create Ingress
Expand Down
1 change: 1 addition & 0 deletions roles/ingress_nginx/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +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: {}
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_helm_kubeconfig }}"
values: "{{ _ingress_nginx_helm_values | combine(ingress_nginx_helm_values, recursive=True) }}"
1 change: 1 addition & 0 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 Down
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_helm_kubeconfig }}"
values: "{{ _ironic_helm_values | combine(ironic_helm_values, recursive=True) }}"

- name: Create Ingress
Expand Down
1 change: 1 addition & 0 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 Down
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_helm_kubeconfig }}"
wait: true
timeout: 10m
values: "{{ _keycloak_helm_values | combine(keycloak_helm_values, recursive=True) }}"
Expand Down
1 change: 1 addition & 0 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
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_helm_kubeconfig }}"
values: "{{ _keystone_helm_values | combine(keystone_helm_values, recursive=True) }}"

- name: Create Ingress
Expand Down
1 change: 1 addition & 0 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
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_helm_kubeconfig }}"
values: "{{ _kube_prometheus_stack_helm_values | combine(kube_prometheus_stack_helm_values, recursive=True) }}"
1 change: 1 addition & 0 deletions roles/libvirt/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +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: {}
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_helm_kubeconfig }}"
values: "{{ _libvirt_helm_values | combine(libvirt_helm_values, recursive=True) }}"
1 change: 1 addition & 0 deletions roles/local_path_provisioner/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +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: {}
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_helm_kubeconfig }}"
values: "{{ _local_path_provisioner_helm_values | combine(local_path_provisioner_helm_values, recursive=True) }}"
1 change: 1 addition & 0 deletions roles/loki/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +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: {}
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_helm_kubeconfig }}"
values: "{{ _loki_helm_values | combine(loki_helm_values, recursive=True) | to_json }}"
1 change: 1 addition & 0 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
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_helm_kubeconfig }}"
values: "{{ _magnum_helm_values | combine(magnum_helm_values, recursive=True) }}"

- name: Deploy "magnum-cluster-api-proxy"
Expand Down
1 change: 1 addition & 0 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 Down
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_helm_kubeconfig }}"
values: "{{ _manila_helm_values | combine(manila_helm_values, recursive=True) }}"

- name: Create Ingress
Expand Down
1 change: 1 addition & 0 deletions roles/memcached/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ memcached_helm_chart_path: "../../charts/memcached/"
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: {}
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_helm_kubeconfig }}"
values: "{{ _memcached_helm_values | combine(memcached_helm_values, recursive=True) }}"

- name: Apply manifests for monitoring
Expand Down
1 change: 1 addition & 0 deletions roles/neutron/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ neutron_helm_chart_path: "../../charts/neutron/"
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
Expand Down
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_helm_kubeconfig }}"
values: "{{ _neutron_helm_values | combine(neutron_helm_values, recursive=True) }}"

- name: Create Ingress
Expand Down
1 change: 1 addition & 0 deletions roles/node_feature_discovery/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ node_feature_discovery_helm_chart_path: "../../charts/node-feature-discovery/"
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: {}
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_helm_kubeconfig }}"
values: "{{ _node_feature_discovery_helm_values | combine(node_feature_discovery_helm_values, recursive=True) }}"
1 change: 1 addition & 0 deletions roles/nova/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ nova_helm_chart_path: "../../charts/nova/"
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
Expand Down
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_helm_kubeconfig }}"
values: "{{ _nova_helm_values | combine(nova_helm_values, recursive=True) }}"

- name: Create Ingress
Expand Down
1 change: 1 addition & 0 deletions roles/octavia/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ octavia_helm_chart_path: "../../charts/octavia/"
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
Expand Down
Loading