diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 6a6c099dcc..30032ef3e2 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -838,8 +838,6 @@ enable_horizon_zun: "{{ enable_zun | bool }}" enable_influxdb: "{{ enable_cloudkitty | bool and cloudkitty_storage_backend == 'influxdb' }}" enable_ironic: "no" enable_ironic_neutron_agent: "{{ enable_neutron | bool and enable_ironic | bool }}" -# TODO(yoctozepto): Remove the deprecated enable_ironic_pxe_uefi in Zed. -enable_ironic_pxe_uefi: "no" enable_ironic_prometheus_exporter: "{{ enable_ironic | bool and enable_prometheus | bool }}" enable_iscsid: "{{ enable_cinder | bool and enable_cinder_backend_iscsi | bool }}" enable_kuryr: "no" diff --git a/ansible/roles/keystone/defaults/main.yml b/ansible/roles/keystone/defaults/main.yml index f3bfb094e2..a99b486157 100644 --- a/ansible/roles/keystone/defaults/main.yml +++ b/ansible/roles/keystone/defaults/main.yml @@ -198,15 +198,11 @@ keystone_service_endpoints: - {'interface': 'internal', 'url': '{{ keystone_internal_url }}'} - {'interface': 'public', 'url': '{{ keystone_public_url }}'} -# TODO(yoctozepto): Remove admin_endpoint leftovers in Antelope (2023.1). -keystone_service_admin_endpoint: {'interface': 'admin', 'url': '{{ keystone_internal_url }}'} -keystone_create_admin_endpoint: false - keystone_ks_services: - name: "keystone" type: "identity" description: "Openstack Identity Service" - endpoints: "{{ keystone_service_endpoints + ([keystone_service_admin_endpoint] if kolla_action == 'upgrade' or keystone_create_admin_endpoint | bool else []) }}" + endpoints: "{{ keystone_service_endpoints }}" #################### # TLS