WIP: Add hostname to /etc/hosts and point the services to this host

14 files changed, 16 insertions, 13 deletions

diff --git a/openstack/etc/cinder/cinder.conf b/openstack/etc/cinder/cinder.conf
index 36fe762b..764c08bc 100644
--- a/openstack/etc/cinder/cinder.conf
+++ b/openstack/etc/cinder/cinder.conf
@@ -2363,7 +2363,7 @@ volume_group=cinder-volumes
 # Deprecated group/name - [DEFAULT]/sql_connection
 # Deprecated group/name - [DATABASE]/sql_connection
 # Deprecated group/name - [sql]/connection
-connection=postgresql://##CINDER_DB_USER##:##CINDER_DB_PASSWORD##@127.0.0.1/cinder
+connection=postgresql://##CINDER_DB_USER##:##CINDER_DB_PASSWORD##@onenode/cinder
  
 # The SQLAlchemy connection string to use to connect to the
 # slave database. (string value)
diff --git a/openstack/etc/glance/glance-api.conf b/openstack/etc/glance/glance-api.conf
index e074a735..c30ce62f 100644
--- a/openstack/etc/glance/glance-api.conf
+++ b/openstack/etc/glance/glance-api.conf
@@ -586,7 +586,7 @@ image_cache_dir = /var/lib/glance/image-cache/
 # Deprecated group/name - [DATABASE]/sql_connection
 # Deprecated group/name - [sql]/connection
 #connection = <None>
-connection=postgresql://##GLANCE_DB_USER##:##GLANCE_DB_PASSWORD##@127.0.0.1/glance
+connection=postgresql://##GLANCE_DB_USER##:##GLANCE_DB_PASSWORD##@onenode/glance
 
 # The SQL mode to be used for MySQL sessions. This option,
 # including the default, overrides any server-set SQL mode. To
diff --git a/openstack/etc/glance/glance-registry.conf b/openstack/etc/glance/glance-registry.conf
index 08a58922..fbfe7c8d 100644
--- a/openstack/etc/glance/glance-registry.conf
+++ b/openstack/etc/glance/glance-registry.conf
@@ -99,7 +99,7 @@ limit_param_default = 25
 # Deprecated group/name - [DATABASE]/sql_connection
 # Deprecated group/name - [sql]/connection
 #connection = <None>
-connection=postgresql://##GLANCE_DB_USER##:##GLANCE_DB_PASSWORD##@127.0.0.1/glance
+connection=postgresql://##GLANCE_DB_USER##:##GLANCE_DB_PASSWORD##@onenode/glance
 
 # The SQL mode to be used for MySQL sessions. This option,
 # including the default, overrides any server-set SQL mode. To
diff --git a/openstack/etc/hosts b/openstack/etc/hosts
new file mode 100644
index 00000000..b35139ac
--- /dev/null
+++ b/openstack/etc/hosts
@@ -0,0 +1,2 @@
+127.0.0.1 localhost onenode
+::1 localhost
diff --git a/openstack/etc/keystone/keystone.conf b/openstack/etc/keystone/keystone.conf
index 3d580d77..a46cc5fc 100644
--- a/openstack/etc/keystone/keystone.conf
+++ b/openstack/etc/keystone/keystone.conf
@@ -628,7 +628,7 @@ rpc_backend=rabbit
 # Deprecated group/name - [DATABASE]/sql_connection
 # Deprecated group/name - [sql]/connection
 #connection=<None>
-connection=postgresql://##KEYSTONE_DB_USER##:##KEYSTONE_DB_PASSWORD##@127.0.0.1/keystone
+connection=postgresql://##KEYSTONE_DB_USER##:##KEYSTONE_DB_PASSWORD##@onenode/keystone
 
 # The SQLAlchemy connection string to use to connect to the
 # slave database. (string value)
diff --git a/openstack/etc/neutron/neutron.conf b/openstack/etc/neutron/neutron.conf
index 8248febb..1e832ccd 100644
--- a/openstack/etc/neutron/neutron.conf
+++ b/openstack/etc/neutron/neutron.conf
@@ -243,7 +243,7 @@ notify_nova_on_port_status_changes = True
 notify_nova_on_port_data_changes = True
  
 # URL for connection to nova (Only supports one nova region currently).
-nova_url = http://127.0.0.1:8774/v2
+nova_url = http://onenode:8774/v2
  
 # Name of nova region to use. Useful if keystone manages more than one region
 nova_region_name = ##NOVA_REGION##
@@ -575,7 +575,7 @@ admin_password = ##NEUTRON_SERVICE_PASSWORD##
 # to put the [database] section and its connection attribute in this
 # configuration file.
 #connection=sqlite:////var/lib/neutron/neutron.sqlite
-connection=postgresql://##NEUTRON_DB_USER##:##NEUTRON_DB_PASSWORD##@127.0.0.1/neutron
+connection=postgresql://##NEUTRON_DB_USER##:##NEUTRON_DB_PASSWORD##@onenode/neutron
  
 # Database engine for which script will be generated when using offline
 # migration
diff --git a/openstack/etc/neutron/plugins/ml2/ml2_conf.ini b/openstack/etc/neutron/plugins/ml2/ml2_conf.ini
index fb4d7a9f..58e5fe21 100644
--- a/openstack/etc/neutron/plugins/ml2/ml2_conf.ini
+++ b/openstack/etc/neutron/plugins/ml2/ml2_conf.ini
@@ -77,7 +77,7 @@ enable_security_group = True
 enable_ipset = True
 
 [ovs]
-local_ip = 127.0.0.1
+local_ip = onenode
 enable_tunneling = True
 bridge_mappings=External:br-ex,Physnet1:br-eth1
 
diff --git a/openstack/etc/nova/nova.conf b/openstack/etc/nova/nova.conf
index 09052cd7..3296cd32 100644
--- a/openstack/etc/nova/nova.conf
+++ b/openstack/etc/nova/nova.conf
@@ -365,7 +365,7 @@ vnc_keymap="en-us"
 # DATABASE #
 ############
 [database]
-connection=postgresql://##NOVA_DB_USER##:##NOVA_DB_PASSWORD##@127.0.0.1/nova
+connection=postgresql://##NOVA_DB_USER##:##NOVA_DB_PASSWORD##@onenode/nova
 
 #############
 # CONDUCTOR #
diff --git a/openstack/manifest b/openstack/manifest
index 767277ca..a1badde4 100644
--- a/openstack/manifest
+++ b/openstack/manifest
@@ -184,3 +184,4 @@
 0100644 0 0 /etc/sysctl.conf
 0100644 0 0 /etc/systemd/system/openvswitch-create-links-one-node.service
 0100755 0 0 /usr/share/openstack/create_openvswitch_veth_pairs
+0100644 0 0 /etc/hosts
diff --git a/openstack/usr/share/openstack/openstack-cinder-setup b/openstack/usr/share/openstack/openstack-cinder-setup
index afe97111..ed85187e 100644
--- a/openstack/usr/share/openstack/openstack-cinder-setup
+++ b/openstack/usr/share/openstack/openstack-cinder-setup
@@ -27,7 +27,7 @@ getent passwd cinder >/dev/null || \
 # Create the keystone user and services
 
 export OS_SERVICE_TOKEN=##KEYSTONE_TEMPORARY_ADMIN_TOKEN##
-export OS_SERVICE_ENDPOINT='http://127.0.0.1:35357/v2.0'
+export OS_SERVICE_ENDPOINT='http://onenode:35357/v2.0'
 
 keystone user-create --name ##CINDER_USER## --pass ##CINDER_PASSWORD##
 keystone user-role-add --tenant service --user ##CINDER_USER## --role admin
diff --git a/openstack/usr/share/openstack/openstack-glance-setup b/openstack/usr/share/openstack/openstack-glance-setup
index 9ae27241..1363a7b7 100644
--- a/openstack/usr/share/openstack/openstack-glance-setup
+++ b/openstack/usr/share/openstack/openstack-glance-setup
@@ -25,7 +25,7 @@ getent passwd glance >/dev/null || \
 
 # Create required keystone tenants, users and roles
 export OS_SERVICE_TOKEN=##KEYSTONE_TEMPORARY_ADMIN_TOKEN##
-export OS_SERVICE_ENDPOINT='http://127.0.0.1:35357/v2.0'
+export OS_SERVICE_ENDPOINT='http://onenode:35357/v2.0'
 
 keystone user-create --name ##GLANCE_SERVICE_USER## --pass ##GLANCE_SERVICE_PASSWORD##
 keystone user-role-add --tenant service --user ##GLANCE_SERVICE_USER## --role admin
diff --git a/openstack/usr/share/openstack/openstack-keystone-setup b/openstack/usr/share/openstack/openstack-keystone-setup
index 3239b466..9c034c5b 100644
--- a/openstack/usr/share/openstack/openstack-keystone-setup
+++ b/openstack/usr/share/openstack/openstack-keystone-setup
@@ -61,7 +61,7 @@ chown -R keystone:keystone /var/lib/keystone
 systemctl start openstack-keystone
 
 export OS_SERVICE_TOKEN=##KEYSTONE_TEMPORARY_ADMIN_TOKEN##
-export OS_SERVICE_ENDPOINT='http://127.0.0.1:35357/v2.0'
+export OS_SERVICE_ENDPOINT='http://onenode:35357/v2.0'
 
 # This script creates a TEMPORARY admin user, with a password that may
 # float arount on the system. Please delete this user once you have set up
diff --git a/openstack/usr/share/openstack/openstack-neutron-setup b/openstack/usr/share/openstack/openstack-neutron-setup
index 03899ede..ff6496a0 100644
--- a/openstack/usr/share/openstack/openstack-neutron-setup
+++ b/openstack/usr/share/openstack/openstack-neutron-setup
@@ -32,7 +32,7 @@ chown -R neutron:neutron /var/lib/neutron
 
 # Create the keystone user and services
 export OS_SERVICE_TOKEN=##KEYSTONE_TEMPORARY_ADMIN_TOKEN##
-export OS_SERVICE_ENDPOINT='http://127.0.0.1:35357/v2.0'
+export OS_SERVICE_ENDPOINT='http://onenode:35357/v2.0'
 
 keystone user-create --name ##NEUTRON_SERVICE_USER## --pass ##NEUTRON_SERVICE_PASSWORD##
 keystone user-role-add --tenant service --user ##NEUTRON_SERVICE_USER## --role admin
diff --git a/openstack/usr/share/openstack/openstack-nova-setup b/openstack/usr/share/openstack/openstack-nova-setup
index 7d83b419..7168e7c2 100644
--- a/openstack/usr/share/openstack/openstack-nova-setup
+++ b/openstack/usr/share/openstack/openstack-nova-setup
@@ -27,7 +27,7 @@ getent passwd nova >/dev/null || \
 # Create the keystone user and services
 
 export OS_SERVICE_TOKEN=##KEYSTONE_TEMPORARY_ADMIN_TOKEN##
-export OS_SERVICE_ENDPOINT='http://127.0.0.1:35357/v2.0'
+export OS_SERVICE_ENDPOINT='http://onenode:35357/v2.0'
 
 keystone user-create --name ##NOVA_SERVICE_USER## --pass ##NOVA_SERVICE_PASSWORD##
 keystone user-role-add --tenant service --user ##NOVA_SERVICE_USER## --role admin