openstack
/
openstack-ansible
Code Issues Proposed changes

Merge "Replace 35357 with 5000 for Keystone Admin Port"

This commit is contained in:
Zuul 2018-07-10 08:20:37 +00:00 committed by Gerrit Code Review
parent 6c19798010 5811dc6fb0
commit 08dcc639eb
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/admin/openstack-operations/verify-deploy.rst
View File

@ -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 |

2
inventory/group_vars/all/keystone.yml
View File

@ -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 }}"

10
inventory/group_vars/haproxy/haproxy.yml
View File

@ -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([]) }}"