Description of problem:

After OSPd deploys an under/overcloud the keystone adminUrl endpoint has a malformed URI.

Version-Release number of selected component (if applicable):
8

How reproducible:
Easily

Steps to Reproduce:
1. Use director to deploy an under/overcloud
2. ssh into the undercloud as the stack user
3. $ source /home/stack/stackrc
4. $ keystone endpoint-list

Actual results:
+----------------------------------+-----------+---------------------------------------------+---------------------------------------------+----------------------------------------+----------------------------------+
|                id                |   region  |                  publicurl                  |                 internalurl                 |                adminurl                |            service_id            |
+----------------------------------+-----------+---------------------------------------------+---------------------------------------------+----------------------------------------+----------------------------------+
| 14b0ad49e98b40239817e42ab3ba0cc3 | regionOne |            http://192.0.2.1:9696            |            http://192.0.2.1:9696            |         http://192.0.2.1:9696          | 92137b7209ca40788913254c371e87b9 |
... <output omitted> ...
| ec66c507afd74310a761007dc7034531 | regionOne |          http://192.0.2.1:5000/v2.0         |          http://192.0.2.1:5000/v2.0         |      http://192.0.2.1:35357//v2.0      | 488ec1f8aabe4acf9734d4883a53e5e9 |
+--------

Expected results:
+----------------------------------+-----------+---------------------------------------------+---------------------------------------------+----------------------------------------+----------------------------------+
|                id                |   region  |                  publicurl                  |                 internalurl                 |                adminurl                |            service_id            |
+----------------------------------+-----------+---------------------------------------------+---------------------------------------------+----------------------------------------+----------------------------------+
| 14b0ad49e98b40239817e42ab3ba0cc3 | regionOne |            http://192.0.2.1:9696            |            http://192.0.2.1:9696            |         http://192.0.2.1:9696          | 92137b7209ca40788913254c371e87b9 |
... <output omitted> ...
| ec66c507afd74310a761007dc7034531 | regionOne |          http://192.0.2.1:5000/v2.0         |          http://192.0.2.1:5000/v2.0         |      http://192.0.2.1:35357/v2.0      | 488ec1f8aabe4acf9734d4883a53e5e9 |
+--------

Additional info:

This issue was noted when attempting generate a tempest config via the config tempest/tools/config_tempest.py tool. 

Note the uri in the GET request at timestamp:2016-03-09 09:22:52.019

[stack@instack tempest]$ tools/config_tempest.py --create --debug identity.uri $OS_AUTH_URL identity.admin_password $OS_PASSWORD
2016-03-09 09:22:51.836 18640 INFO tempest [-] Using tempest config file /etc/tempest/tempest.conf
2016-03-09 09:22:51.917 18640 INFO __main__ [-] Reading defaults from file '/home/stack/tempest/etc/default-overrides.conf'
2016-03-09 09:22:51.918 18640 DEBUG __main__ [-] Setting [identity] uri = http://192.0.2.1:5000/v2.0 set tools/config_tempest.py:403
2016-03-09 09:22:51.918 18640 DEBUG __main__ [-] Setting [identity] admin_password = ecc0073453a6063ffdf4bdea10319ddb46aa3336 set tools/config_tempest.py:403
2016-03-09 09:22:51.919 18640 DEBUG __main__ [-] Setting [identity] uri_v3 = http://192.0.2.1:5000/v3 set tools/config_tempest.py:403
2016-03-09 09:22:52.003 18640 INFO tempest_lib.common.rest_client [req-3fd6e18a-0b8a-4996-bee8-1f6b1fdad0d1 ] Request (main): 200 POST http://192.0.2.1:5000/v2.0/tokens
2016-03-09 09:22:52.019 18640 INFO tempest_lib.common.rest_client [req-8dd6be79-9d27-4acc-bb29-565b47dcf198 ] Request (main): 404 GET **http://192.0.2.1:35357/v2.0/v2.0/tenants 0.015s**
... <output omitted> ...
2016-03-09 09:22:52.020 18640 ERROR tempest Details: {u'message': u'The resource could not be found.', u'code': 404, u'title': u'Not Found'}
2016-03-09 09:22:52.020 18640 ERROR tempest