From 953861bde1118a300b5e608442f07e9fb70dabe9 Mon Sep 17 00:00:00 2001 From: Eduardo Gonzalez Date: Fri, 27 Oct 2017 07:44:43 +0200 Subject: [PATCH] Clean update endpoints task in keystone upgrade Endpoints are updated in pike upgrade, queens and later dont need such action. Change-Id: I13723bafc4bf09c24d9bcd2ec7b4e002ae83aec0 --- .../roles/keystone/tasks/update_endpoints.yml | 22 ------------------- ansible/roles/keystone/tasks/upgrade.yml | 3 --- 2 files changed, 25 deletions(-) delete mode 100644 ansible/roles/keystone/tasks/update_endpoints.yml diff --git a/ansible/roles/keystone/tasks/update_endpoints.yml b/ansible/roles/keystone/tasks/update_endpoints.yml deleted file mode 100644 index bfa9155b40..0000000000 --- a/ansible/roles/keystone/tasks/update_endpoints.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -- name: Updating keystone endpoints - kolla_toolbox: - module_name: "kolla_keystone_service" - module_args: - service_name: "keystone" - service_type: "identity" - description: "Identity Service" - endpoint_region: "{{ openstack_region_name }}" - url: "{{ item.url }}" - interface: "{{ item.interface }}" - region_name: "{{ openstack_region_name }}" - auth: "{{ '{{ openstack_keystone_auth }}' }}" - endpoint_type: "{{ openstack_interface }}" - module_extra_vars: - openstack_keystone_auth: "{{ openstack_keystone_auth }}" - run_once: True - register: update - with_items: - - {'interface': 'admin', 'url': '{{ keystone_admin_url }}'} - - {'interface': 'internal', 'url': '{{ keystone_internal_url }}'} - - {'interface': 'public', 'url': '{{ keystone_public_url }}'} diff --git a/ansible/roles/keystone/tasks/upgrade.yml b/ansible/roles/keystone/tasks/upgrade.yml index 64066f97f5..c38db1adf4 100644 --- a/ansible/roles/keystone/tasks/upgrade.yml +++ b/ansible/roles/keystone/tasks/upgrade.yml @@ -5,6 +5,3 @@ - name: Flush handlers meta: flush_handlers - -#NOTE(egonzalez): Remove after Pike is released -- include: update_endpoints.yml