From 5811dc6fb0dc3b009dc4f0f455b82e31055d21eb Mon Sep 17 00:00:00 2001 From: Vu Cong Tuan Date: Fri, 1 Jun 2018 16:42:18 +0700 Subject: [PATCH] Replace 35357 with 5000 for Keystone Admin Port Based on the change in Keystone Install Guide [1] and suggestion of Jean-Philippe Evrard in openstack-ansible-tests [2], this patch replace port 35357 with 5000 for Keystone Admin Port. For more details, please check similar changes which have been done on other projects: Nova [3], Neutron [4], Cinder [5], Glance [6]. [1] https://review.openstack.org/#/c/541857 [2] https://review.openstack.org/#/c/569709 [3] https://review.openstack.org/#/c/562812 [4] https://review.openstack.org/#/c/566491 [5] https://review.openstack.org/#/c/565464 [6] https://review.openstack.org/#/c/558932 Change-Id: Id66aba8e06fbd2a8699fcb7284a09af39a4a35ab --- .../admin/openstack-operations/verify-deploy.rst | 2 +- inventory/group_vars/all/keystone.yml | 2 +- inventory/group_vars/haproxy/haproxy.yml | 10 ---------- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/doc/source/admin/openstack-operations/verify-deploy.rst b/doc/source/admin/openstack-operations/verify-deploy.rst index daa9bda35a..42593c48e2 100644 --- a/doc/source/admin/openstack-operations/verify-deploy.rst +++ b/doc/source/admin/openstack-operations/verify-deploy.rst @@ -75,7 +75,7 @@ the OpenStack API and dashboard, as an administrator. | [ID truncated] | RegionOne | swift | object-store | True | public | https://10.23.100.127:8080/v1/AUTH_%(project_id)s | | [ID truncated] | RegionOne | designate | dns | True | admin | http://172.29.236.100:9001 | | [ID truncated] | RegionOne | cinderv2 | volumev2 | True | public | https://10.23.100.127:8776/v2/%(project_id)s | - | [ID truncated] | RegionOne | keystone | identity | True | admin | http://172.29.236.100:35357/v3 | + | [ID truncated] | RegionOne | keystone | identity | True | admin | http://172.29.236.100:5000/v3 | | [ID truncated] | RegionOne | ceilometer | metering | True | admin | http://172.29.236.100:8777/ | | [ID truncated] | RegionOne | nova | compute | True | public | https://10.23.100.127:8774/v2.1/%(project_id)s | | [ID truncated] | RegionOne | keystone | identity | True | internal | http://172.29.236.100:5000/v3 | diff --git a/inventory/group_vars/all/keystone.yml b/inventory/group_vars/all/keystone.yml index bbd1238b6c..bc401a8b64 100644 --- a/inventory/group_vars/all/keystone.yml +++ b/inventory/group_vars/all/keystone.yml @@ -18,7 +18,7 @@ keystone_admin_user_name: admin keystone_admin_tenant_name: admin -keystone_admin_port: 35357 +keystone_admin_port: 5000 keystone_service_port: 5000 keystone_service_proto: http keystone_service_region: "{{ service_region }}" diff --git a/inventory/group_vars/haproxy/haproxy.yml b/inventory/group_vars/haproxy/haproxy.yml index 5dcc09e898..24c5876c52 100644 --- a/inventory/group_vars/haproxy/haproxy.yml +++ b/inventory/group_vars/haproxy/haproxy.yml @@ -141,16 +141,6 @@ haproxy_default_services: haproxy_backend_options: - "httpchk HEAD / HTTP/1.0\\r\\nUser-agent:\\ osa-haproxy-healthcheck" haproxy_service_enabled: "{{ groups['keystone_all'] is defined and groups['keystone_all'] | length > 0 }}" - - service: - haproxy_service_name: keystone_admin - haproxy_backend_nodes: "{{ groups['keystone_all'] | default([]) }}" - haproxy_port: 35357 - haproxy_ssl: "{{ haproxy_ssl }}" - haproxy_balance_type: "http" - haproxy_backend_options: - - "httpchk HEAD / HTTP/1.0\\r\\nUser-agent:\\ osa-haproxy-healthcheck" - haproxy_whitelist_networks: "{{ haproxy_keystone_admin_whitelist_networks }}" - haproxy_service_enabled: "{{ groups['keystone_all'] is defined and groups['keystone_all'] | length > 0 }}" - service: haproxy_service_name: neutron_server haproxy_backend_nodes: "{{ groups['neutron_server'] | default([]) }}"