summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2015-08-10 12:05:35 +0000
committerBaserock Gerrit <gerrit@baserock.org>2015-08-19 03:32:39 +0000
commit93878e0fc4c1c20d99ac866ff4140030bf7214ce (patch)
treebcba1d897f23ed8fa43fdd8ca01da985b1d58f8f
parent1b4eef2c1734d783296919e7c030e66f8d49e68e (diff)
downloaddefinitions-93878e0fc4c1c20d99ac866ff4140030bf7214ce.tar.gz
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
-rw-r--r--clusters/openstack-one-node.morph2
-rw-r--r--clusters/openstack-three-node-installer.morph3
-rw-r--r--clusters/openstack-two-node-installer.morph2
-rw-r--r--install-files/openstack/usr/share/openstack/ceilometer-db.yml2
-rw-r--r--install-files/openstack/usr/share/openstack/cinder-db.yml4
-rw-r--r--install-files/openstack/usr/share/openstack/glance.yml2
-rw-r--r--install-files/openstack/usr/share/openstack/ironic.yml2
-rw-r--r--install-files/openstack/usr/share/openstack/keystone.yml4
-rw-r--r--install-files/openstack/usr/share/openstack/neutron-db.yml2
-rw-r--r--install-files/openstack/usr/share/openstack/nova-db.yml2
10 files changed, 9 insertions, 16 deletions
diff --git a/clusters/openstack-one-node.morph b/clusters/openstack-one-node.morph
index 1b31996a..12985463 100644
--- a/clusters/openstack-one-node.morph
+++ b/clusters/openstack-one-node.morph
@@ -99,8 +99,6 @@ systems:
CEILOMETER_DB_PASSWORD: veryinsecure
METERING_SECRET: insecureceilometersecret
- HOSTS_CONTROLLER: <management ip> onenode
-
# Network interface to be used, only needed if there are more
# than one available.
# EXTERNAL_INTERFACE: eno1
diff --git a/clusters/openstack-three-node-installer.morph b/clusters/openstack-three-node-installer.morph
index 87c7056b..144f29f2 100644
--- a/clusters/openstack-three-node-installer.morph
+++ b/clusters/openstack-three-node-installer.morph
@@ -146,7 +146,6 @@ systems:
CONTROLLER_HOST_ADDRESS: threenode-controller.os-mgmt
MANAGEMENT_INTERFACE_IP_ADDRESS: 10.0.0.1
- HOSTS_SELF: 10.0.0.1 threenode-network
HOSTS_NETWORK: 10.0.0.1 threenode-network.os-mgmt
HOSTS_CONTROL: 10.0.0.2 threenode-controller.os-mgmt
HOSTS_COMPUTE: 10.0.0.3 threenode-compute.os-mgmt
@@ -194,7 +193,6 @@ systems:
CEILOMETER_ENABLE_COMPUTE: false
MANAGEMENT_INTERFACE_IP_ADDRESS: 10.0.0.2
- HOSTS_SELF: 10.0.0.2 threenode-controller
EXTERNAL_INTERFACE: enp2s0
NETWORK_CONFIG: enp2s0:dhcp;enp0s26u1u2:static,address=10.0.0.2,netmask=255.255.255.0
SYNC_TIME_WITH_CONTROLLER: false
@@ -231,7 +229,6 @@ systems:
CEILOMETER_ENABLE_COMPUTE: true
MANAGEMENT_INTERFACE_IP_ADDRESS: 10.0.0.3
- HOSTS_SELF: 10.0.0.3 threenode-compute
EXTERNAL_INTERFACE: eno1
NETWORK_CONFIG: eno1:dhcp;enp0s29u1u3:static,address=10.0.0.3,netmask=255.255.255.0
SYNC_TIME_WITH_CONTROLLER: true
diff --git a/clusters/openstack-two-node-installer.morph b/clusters/openstack-two-node-installer.morph
index e9c90cd1..0c08bd4f 100644
--- a/clusters/openstack-two-node-installer.morph
+++ b/clusters/openstack-two-node-installer.morph
@@ -145,7 +145,6 @@ systems:
CONTROLLER_HOST_ADDRESS: twonode-controller.os-mgmt
MANAGEMENT_INTERFACE_IP_ADDRESS: 10.0.0.1
- HOSTS_SELF: 10.0.0.1 twonode-controller
HOSTS_CONTROL: 10.0.0.1 twonode-controller.os-mgmt
HOSTS_COMPUTE: 10.0.0.3 twonode-compute.os-mgmt
EXTERNAL_INTERFACE: enp3s0
@@ -191,7 +190,6 @@ systems:
CEILOMETER_ENABLE_COMPUTE: true
MANAGEMENT_INTERFACE_IP_ADDRESS: 10.0.0.3
- HOSTS_SELF: 10.0.0.3 twonode-compute
EXTERNAL_INTERFACE: eno1
NETWORK_CONFIG: eno1:dhcp;enp0s29u1u3:static,address=10.0.0.3,netmask=255.255.255.0
SYNC_TIME_WITH_CONTROLLER: true
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'