openstack: fix the public endpoints

The public keystone endpoints ought to be accessible outside of the
three-node cluster.  However, the CONTROLLER_HOST_ADDRESS parameter
corresponds to an hostname that maps to an IP addess in the private
management network.  Resolve this by creating the public endpoints with
the controller hostname, which should be public accessible.

In addition, the admin endpoint for keystone needs to be public
accessible as well.

Also, remove unneeded entries in the hosts files.  E.g
threenode-controller could resolve to a private or public IP address,
depending on the configuration on nsswitch.conf.

Change-Id: Ibb305d0541ee4094fcc0aa1f8233a5d98fed58e5

7 files changed, 9 insertions, 9 deletions

diff --git a/install-files/openstack/usr/share/openstack/ceilometer-db.yml b/install-files/openstack/usr/share/openstack/ceilometer-db.yml
index 717c7d7d..46a929bc 100644
--- a/install-files/openstack/usr/share/openstack/ceilometer-db.yml
+++ b/install-files/openstack/usr/share/openstack/ceilometer-db.yml
@@ -22,7 +22,7 @@
         name: ceilometer
         type: metering
         description: Openstack Metering Service
-        publicurl: http://{{ CONTROLLER_HOST_ADDRESS }}:8777
+        publicurl: http://{{ ansible_hostname }}:8777
         internalurl: http://{{ CONTROLLER_HOST_ADDRESS }}:8777
         adminurl: http://{{ CONTROLLER_HOST_ADDRESS }}:8777
         region: regionOne
diff --git a/install-files/openstack/usr/share/openstack/cinder-db.yml b/install-files/openstack/usr/share/openstack/cinder-db.yml
index 5f89da37..24e4980f 100644
--- a/install-files/openstack/usr/share/openstack/cinder-db.yml
+++ b/install-files/openstack/usr/share/openstack/cinder-db.yml
@@ -22,7 +22,7 @@
         name: cinder
         type: volume
         description: Openstack Block Storage
-        publicurl: 'http://{{ CONTROLLER_HOST_ADDRESS }}:8776/v1/%(tenant_id)s'
+        publicurl: 'http://{{ ansible_hostname }}:8776/v1/%(tenant_id)s'
         internalurl: 'http://{{ CONTROLLER_HOST_ADDRESS }}:8776/v1/%(tenant_id)s'
         adminurl: 'http://{{ CONTROLLER_HOST_ADDRESS }}:8776/v1/%(tenant_id)s'
         region: regionOne
@@ -33,7 +33,7 @@
         name: cinderv2
         type: volumev2
         description: Openstack Block Storage
-        publicurl: 'http://{{ CONTROLLER_HOST_ADDRESS }}:8776/v2/%(tenant_id)s'
+        publicurl: 'http://{{ ansible_hostname }}:8776/v2/%(tenant_id)s'
         internalurl: 'http://{{ CONTROLLER_HOST_ADDRESS }}:8776/v2/%(tenant_id)s'
         adminurl: 'http://{{ CONTROLLER_HOST_ADDRESS }}:8776/v2/%(tenant_id)s'
         region: regionOne
diff --git a/install-files/openstack/usr/share/openstack/glance.yml b/install-files/openstack/usr/share/openstack/glance.yml
index 830f2bd3..4d642b6c 100644
--- a/install-files/openstack/usr/share/openstack/glance.yml
+++ b/install-files/openstack/usr/share/openstack/glance.yml
@@ -55,7 +55,7 @@
         name: glance
         type: image
         description: Openstack Image Service
-        publicurl: http://{{ CONTROLLER_HOST_ADDRESS }}:9292
+        publicurl: http://{{ ansible_hostname }}:9292
         internalurl: http://{{ CONTROLLER_HOST_ADDRESS }}:9292
         adminurl: http://{{ CONTROLLER_HOST_ADDRESS }}:9292
         region: regionOne
diff --git a/install-files/openstack/usr/share/openstack/ironic.yml b/install-files/openstack/usr/share/openstack/ironic.yml
index db0a8aa8..19906b04 100644
--- a/install-files/openstack/usr/share/openstack/ironic.yml
+++ b/install-files/openstack/usr/share/openstack/ironic.yml
@@ -49,7 +49,7 @@
         name: ironic
         type: baremetal
         description: Openstack Ironic Service
-        publicurl: 'http://{{ CONTROLLER_HOST_ADDRESS }}:6385'
+        publicurl: 'http://{{ ansible_hostname }}:6385'
         internalurl: 'http://{{ CONTROLLER_HOST_ADDRESS }}:6385'
         adminurl: 'http://{{ CONTROLLER_HOST_ADDRESS }}:6385'
         region: 'regionOne'
diff --git a/install-files/openstack/usr/share/openstack/keystone.yml b/install-files/openstack/usr/share/openstack/keystone.yml
index 00bcac1a..2fae4e98 100644
--- a/install-files/openstack/usr/share/openstack/keystone.yml
+++ b/install-files/openstack/usr/share/openstack/keystone.yml
@@ -134,9 +134,9 @@
         name: keystone
         type: identity
         description: Keystone Identity Service
-        publicurl: http://{{ CONTROLLER_HOST_ADDRESS }}:5000/v2.0
+        publicurl: http://{{ ansible_hostname }}:5000/v2.0
         internalurl: http://{{ CONTROLLER_HOST_ADDRESS }}:5000/v2.0
-        adminurl: http://{{ CONTROLLER_HOST_ADDRESS }}:35357/v2.0
+        adminurl: http://{{ ansible_hostname }}:35357/v2.0
         region: regionOne
         token: "{{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }}"
         endpoint: http://{{ CONTROLLER_HOST_ADDRESS }}:35357/v2.0
diff --git a/install-files/openstack/usr/share/openstack/neutron-db.yml b/install-files/openstack/usr/share/openstack/neutron-db.yml
index 9cc77b5a..fee53315 100644
--- a/install-files/openstack/usr/share/openstack/neutron-db.yml
+++ b/install-files/openstack/usr/share/openstack/neutron-db.yml
@@ -21,7 +21,7 @@
         name: neutron
         type: network
         description: Openstack Compute Networking
-        publicurl: http://{{ CONTROLLER_HOST_ADDRESS }}:9696
+        publicurl: http://{{ ansible_hostname }}:9696
         internalurl: http://{{ CONTROLLER_HOST_ADDRESS }}:9696
         adminurl: http://{{ CONTROLLER_HOST_ADDRESS }}:9696
         region: regionOne
diff --git a/install-files/openstack/usr/share/openstack/nova-db.yml b/install-files/openstack/usr/share/openstack/nova-db.yml
index 800d6c4b..0e933ba8 100644
--- a/install-files/openstack/usr/share/openstack/nova-db.yml
+++ b/install-files/openstack/usr/share/openstack/nova-db.yml
@@ -22,7 +22,7 @@
         name: nova
         type: compute
         description: Openstack Compute Service
-        publicurl: 'http://{{ CONTROLLER_HOST_ADDRESS }}:8774/v2/%(tenant_id)s'
+        publicurl: 'http://{{ ansible_hostname }}:8774/v2/%(tenant_id)s'
         internalurl: 'http://{{ CONTROLLER_HOST_ADDRESS }}:8774/v2/%(tenant_id)s'
         adminurl: 'http://{{ CONTROLLER_HOST_ADDRESS }}:8774/v2/%(tenant_id)s'
         region: 'regionOne'