diff --git a/.gitignore b/.gitignore index d362686ff..84aba42cb 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,5 @@ collections/ [._]*.un~ Session.vim Sessionx.vim + +.venv diff --git a/roles/barbican/defaults/main.yml b/roles/barbican/defaults/main.yml index 219752d79..809b883c9 100644 --- a/roles/barbican/defaults/main.yml +++ b/roles/barbican/defaults/main.yml @@ -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') }}" diff --git a/roles/barbican/tasks/main.yml b/roles/barbican/tasks/main.yml index f6f4aafb9..09cc98e1c 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_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 c64ad8f1a..581bdfeea 100644 --- a/roles/ceph_csi_rbd/defaults/main.yml +++ b/roles/ceph_csi_rbd/defaults/main.yml @@ -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') }}" diff --git a/roles/ceph_csi_rbd/tasks/main.yml b/roles/ceph_csi_rbd/tasks/main.yml index 3a03a265a..4db72bb7a 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_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 6c5366ba4..ebe46026c 100644 --- a/roles/ceph_provisioners/defaults/main.yml +++ b/roles/ceph_provisioners/defaults/main.yml @@ -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') }}" diff --git a/roles/ceph_provisioners/tasks/main.yml b/roles/ceph_provisioners/tasks/main.yml index e62069bd0..c763b936e 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_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 31d8a8e11..03e3ecb53 100644 --- a/roles/cinder/defaults/main.yml +++ b/roles/cinder/defaults/main.yml @@ -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') }}" diff --git a/roles/cinder/tasks/main.yml b/roles/cinder/tasks/main.yml index 0da6a3e51..3384418c0 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_kubeconfig }}" values: "{{ _cinder_helm_values | combine(cinder_helm_values, recursive=True) }}" - name: Create Ingress diff --git a/roles/cluster_issuer/defaults/main.yml b/roles/cluster_issuer/defaults/main.yml index 38ef2ba38..8bcfddc2c 100644 --- a/roles/cluster_issuer/defaults/main.yml +++ b/roles/cluster_issuer/defaults/main.yml @@ -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: diff --git a/roles/coredns/defaults/main.yml b/roles/coredns/defaults/main.yml index 24282ff29..055c8c645 100644 --- a/roles/coredns/defaults/main.yml +++ b/roles/coredns/defaults/main.yml @@ -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') }}" diff --git a/roles/coredns/tasks/main.yml b/roles/coredns/tasks/main.yml index 09fad5212..18b88a8b6 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_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 5c94d5bff..22eb2551c 100644 --- a/roles/designate/defaults/main.yml +++ b/roles/designate/defaults/main.yml @@ -24,3 +24,5 @@ designate_ingress_annotations: {} # Pools definition designate_pools: "" + +designate_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}" diff --git a/roles/designate/tasks/main.yml b/roles/designate/tasks/main.yml index e43c1cee0..5a1ba54b9 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_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 5d9dc6e1b..4405bef00 100644 --- a/roles/glance/defaults/main.yml +++ b/roles/glance/defaults/main.yml @@ -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') }}" diff --git a/roles/glance/tasks/main.yml b/roles/glance/tasks/main.yml index 5bf19e802..b1e270b92 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_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 aae6f4bc7..0ed5b64ec 100644 --- a/roles/goldpinger/defaults/main.yml +++ b/roles/goldpinger/defaults/main.yml @@ -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') }}" diff --git a/roles/goldpinger/tasks/main.yml b/roles/goldpinger/tasks/main.yml index 42c71a310..c1c8059e3 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_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 373f377cb..aca11b758 100644 --- a/roles/heat/defaults/main.yml +++ b/roles/heat/defaults/main.yml @@ -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') }}" diff --git a/roles/heat/tasks/main.yml b/roles/heat/tasks/main.yml index 141807944..1d9507806 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_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 acec94889..929a35000 100644 --- a/roles/horizon/defaults/main.yml +++ b/roles/horizon/defaults/main.yml @@ -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') }}" diff --git a/roles/horizon/tasks/main.yml b/roles/horizon/tasks/main.yml index 6ef8685a7..d9b9fbf56 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_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 a441ef6f2..b922a7840 100644 --- a/roles/ingress_nginx/defaults/main.yml +++ b/roles/ingress_nginx/defaults/main.yml @@ -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') }}" diff --git a/roles/ingress_nginx/tasks/main.yml b/roles/ingress_nginx/tasks/main.yml index a7b32239e..c67c8b788 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_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 158e06b92..4f019071c 100644 --- a/roles/ironic/defaults/main.yml +++ b/roles/ironic/defaults/main.yml @@ -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') }}" diff --git a/roles/ironic/tasks/main.yml b/roles/ironic/tasks/main.yml index 09cc9c624..27986f8d6 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_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 324ab4355..14e3d097b 100644 --- a/roles/keycloak/defaults/main.yml +++ b/roles/keycloak/defaults/main.yml @@ -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') }}" diff --git a/roles/keycloak/tasks/main.yml b/roles/keycloak/tasks/main.yml index f10ffa345..eb3232634 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_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 40ca892d2..0d559acff 100644 --- a/roles/keystone/defaults/main.yml +++ b/roles/keystone/defaults/main.yml @@ -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') }}" diff --git a/roles/keystone/tasks/main.yml b/roles/keystone/tasks/main.yml index df942ec97..6e5a8997d 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_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 ec151360a..65a993914 100644 --- a/roles/kube_prometheus_stack/defaults/main.yml +++ b/roles/kube_prometheus_stack/defaults/main.yml @@ -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') }}" diff --git a/roles/kube_prometheus_stack/tasks/main.yml b/roles/kube_prometheus_stack/tasks/main.yml index 3926eaba4..9c1043385 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_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 2c2cc40ac..777a5745e 100644 --- a/roles/libvirt/defaults/main.yml +++ b/roles/libvirt/defaults/main.yml @@ -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') }}" diff --git a/roles/libvirt/tasks/main.yml b/roles/libvirt/tasks/main.yml index afc37af7b..2e191b759 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_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 c9cbce700..12f490b24 100644 --- a/roles/local_path_provisioner/defaults/main.yml +++ b/roles/local_path_provisioner/defaults/main.yml @@ -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') }}" diff --git a/roles/local_path_provisioner/tasks/main.yml b/roles/local_path_provisioner/tasks/main.yml index 1554afaf1..0a7cbdf87 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_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 196238bff..828819bad 100644 --- a/roles/loki/defaults/main.yml +++ b/roles/loki/defaults/main.yml @@ -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') }}" diff --git a/roles/loki/tasks/main.yml b/roles/loki/tasks/main.yml index 01e204802..c682a6537 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_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 60cd1a7aa..7b37454b5 100644 --- a/roles/magnum/defaults/main.yml +++ b/roles/magnum/defaults/main.yml @@ -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') }}" diff --git a/roles/magnum/tasks/main.yml b/roles/magnum/tasks/main.yml index b9b66cbf4..5712f858e 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_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 b35bb8538..e34ce3a54 100644 --- a/roles/manila/defaults/main.yml +++ b/roles/manila/defaults/main.yml @@ -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') }}" diff --git a/roles/manila/tasks/main.yml b/roles/manila/tasks/main.yml index b5f0dd9b2..d8405a003 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_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 ce65ecaef..21e66f7e4 100644 --- a/roles/memcached/defaults/main.yml +++ b/roles/memcached/defaults/main.yml @@ -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') }}" diff --git a/roles/memcached/tasks/main.yml b/roles/memcached/tasks/main.yml index 58c2060af..f1dee643b 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_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 1cb4215fe..b998edb79 100644 --- a/roles/neutron/defaults/main.yml +++ b/roles/neutron/defaults/main.yml @@ -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') }}" diff --git a/roles/neutron/tasks/main.yml b/roles/neutron/tasks/main.yml index eabe333a8..0d20f4619 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_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 43124cb62..dea7cf5e8 100644 --- a/roles/node_feature_discovery/defaults/main.yml +++ b/roles/node_feature_discovery/defaults/main.yml @@ -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') }}" diff --git a/roles/node_feature_discovery/tasks/main.yml b/roles/node_feature_discovery/tasks/main.yml index 25f8380ea..584e9ba08 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_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 bee46a1cd..3766c4201 100644 --- a/roles/nova/defaults/main.yml +++ b/roles/nova/defaults/main.yml @@ -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') }}" diff --git a/roles/nova/tasks/main.yml b/roles/nova/tasks/main.yml index 813f042a8..4929aa226 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_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 e97c77b21..cda6b8b41 100644 --- a/roles/octavia/defaults/main.yml +++ b/roles/octavia/defaults/main.yml @@ -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') }}" diff --git a/roles/octavia/tasks/main.yml b/roles/octavia/tasks/main.yml index d48a53fa7..b00e81696 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_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 52bab4cd4..aa578b8b4 100644 --- a/roles/openvswitch/defaults/main.yml +++ b/roles/openvswitch/defaults/main.yml @@ -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') }}" diff --git a/roles/openvswitch/tasks/main.yml b/roles/openvswitch/tasks/main.yml index 002c6dbcd..02db4b96c 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_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 a6ebdb96d..65f60f823 100644 --- a/roles/ovn/defaults/main.yml +++ b/roles/ovn/defaults/main.yml @@ -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') }}" diff --git a/roles/ovn/tasks/main.yml b/roles/ovn/tasks/main.yml index 8c9eb37f2..e18ccb497 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_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 67b9b4683..089cb0f33 100644 --- a/roles/percona_xtradb_cluster_operator/defaults/main.yml +++ b/roles/percona_xtradb_cluster_operator/defaults/main.yml @@ -18,3 +18,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_values: {} + +percona_xtradb_cluster_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}" diff --git a/roles/percona_xtradb_cluster_operator/tasks/main.yml b/roles/percona_xtradb_cluster_operator/tasks/main.yml index 25972a056..11bfd4e02 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_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 ac540b313..61b686e88 100644 --- a/roles/placement/defaults/main.yml +++ b/roles/placement/defaults/main.yml @@ -21,3 +21,5 @@ placement_helm_values: {} # List of annotations to apply to the Ingress placement_ingress_annotations: {} + +placement_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}" diff --git a/roles/placement/tasks/main.yml b/roles/placement/tasks/main.yml index 0d664ecfa..a2acbe654 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_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 000000000..a776a30d3 --- /dev/null +++ b/roles/powerstore_csi/defaults/main.yaml @@ -0,0 +1 @@ +powerstore_csi_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 5caec12e4..82f99a5f6 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_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 1c5999818..31b8e90b4 100644 --- a/roles/prometheus_pushgateway/defaults/main.yml +++ b/roles/prometheus_pushgateway/defaults/main.yml @@ -18,3 +18,5 @@ prometheus_pushgateway_helm_chart_ref: /usr/local/src/prometheus-pushgateway prometheus_pushgateway_helm_release_namespace: monitoring prometheus_pushgateway_helm_values: {} + +prometheus_pushgateway_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}" diff --git a/roles/prometheus_pushgateway/tasks/main.yml b/roles/prometheus_pushgateway/tasks/main.yml index 44e624759..c2a74b826 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_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 e37634712..8a32f4620 100644 --- a/roles/rabbitmq_cluster_operator/defaults/main.yml +++ b/roles/rabbitmq_cluster_operator/defaults/main.yml @@ -18,3 +18,5 @@ rabbitmq_cluster_operator_helm_chart_ref: /usr/local/src/rabbitmq-cluster-operat rabbitmq_cluster_operator_helm_release_namespace: openstack rabbitmq_cluster_operator_helm_values: {} + +rabbitmq_cluster_operator_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}" diff --git a/roles/rabbitmq_cluster_operator/tasks/main.yml b/roles/rabbitmq_cluster_operator/tasks/main.yml index 565e797fd..da80cd7de 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_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 353a38129..2c2e0eebf 100644 --- a/roles/rook_ceph/defaults/main.yml +++ b/roles/rook_ceph/defaults/main.yml @@ -18,3 +18,5 @@ rook_ceph_helm_chart_ref: /usr/local/src/rook-ceph rook_ceph_helm_release_namespace: rook-ceph rook_ceph_helm_values: {} + +rook_ceph_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}" diff --git a/roles/rook_ceph/tasks/main.yml b/roles/rook_ceph/tasks/main.yml index f38941186..c1f4bb73e 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_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 b582e443b..7f803c08b 100644 --- a/roles/rook_ceph_cluster/defaults/main.yml +++ b/roles/rook_ceph_cluster/defaults/main.yml @@ -28,3 +28,5 @@ rook_ceph_cluster_mon_group: controllers rook_ceph_cluster_spec: {} rook_ceph_cluster_radosgw_spec: {} + +rook_ceph_cluster_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}" diff --git a/roles/rook_ceph_cluster/tasks/main.yml b/roles/rook_ceph_cluster/tasks/main.yml index 39675d794..73bfe315a 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_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 62c30f0f8..59e961209 100644 --- a/roles/staffeln/defaults/main.yaml +++ b/roles/staffeln/defaults/main.yaml @@ -20,3 +20,5 @@ staffeln_helm_release_namespace: openstack staffeln_helm_values: {} staffeln_backup_metadata_key: "__staffeln_backup" staffeln_retention_metadata_key: "__staffeln_retention" + +staffeln_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}" diff --git a/roles/staffeln/tasks/main.yaml b/roles/staffeln/tasks/main.yaml index 7e055f31f..9eca5e4d8 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_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 56b4ebab4..4475e12f0 100644 --- a/roles/tempest/defaults/main.yml +++ b/roles/tempest/defaults/main.yml @@ -18,3 +18,5 @@ tempest_helm_chart_ref: /usr/local/src/tempest tempest_helm_release_namespace: openstack tempest_helm_values: {} + +tempest_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}" diff --git a/roles/tempest/tasks/main.yml b/roles/tempest/tasks/main.yml index 833cda712..d788ba0b9 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_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 0ce0ff9dc..cd621e113 100644 --- a/roles/vector/defaults/main.yml +++ b/roles/vector/defaults/main.yml @@ -18,3 +18,5 @@ vector_helm_chart_ref: /usr/local/src/vector vector_helm_release_namespace: monitoring vector_helm_values: {} + +vector_kubeconfig: "{{ kubeconfig_path | default('/etc/kubernetes/admin.conf') }}" diff --git a/roles/vector/tasks/main.yml b/roles/vector/tasks/main.yml index ec5eb59c2..b999723bf 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_kubeconfig }}" values: "{{ _vector_helm_values | combine(vector_helm_values, recursive=True) }}"