summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-02-04 18:41:38 (GMT)
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-02-04 18:41:38 (GMT)
commite845fe6aa5c89cf84dcbcd826378cf2658897fb5 (patch)
treef6924d4f65daf81561077799f3e8ec134ee0c4fe
parent5371d95fd82aba0a29b9967e9d428542b3827a1b (diff)
downloaddefinitions-e845fe6aa5c89cf84dcbcd826378cf2658897fb5.tar.gz
Revert the change from localhost to 127.0.0.1 done in a previous commit
-rw-r--r--openstack/etc/cinder/cinder.conf12
-rw-r--r--openstack/etc/glance/glance-api.conf16
-rw-r--r--openstack/etc/glance/glance-cache.conf12
-rw-r--r--openstack/etc/keystone/keystone.conf6
-rw-r--r--openstack/etc/neutron/neutron.conf8
-rw-r--r--openstack/etc/nova/nova.conf4
6 files changed, 29 insertions, 29 deletions
diff --git a/openstack/etc/cinder/cinder.conf b/openstack/etc/cinder/cinder.conf
index 0d713d8..36fe762 100644
--- a/openstack/etc/cinder/cinder.conf
+++ b/openstack/etc/cinder/cinder.conf
@@ -16,7 +16,7 @@ state_path = /var/lib/cinder
#rpc_conn_pool_size=30
# Qpid broker hostname. (string value)
-#qpid_hostname=127.0.0.1
+#qpid_hostname=localhost
# Qpid broker port. (integer value)
#qpid_port=5672
@@ -661,7 +661,7 @@ auth_strategy=keystone
#nova_catalog_admin_info=compute:nova:adminURL
# Override service catalog lookup with template for nova
-# endpoint e.g. http://127.0.0.1:8774/v2/%(project_id)s
+# endpoint e.g. http://localhost:8774/v2/%(project_id)s
# (string value)
#nova_endpoint_template=<None>
@@ -2523,10 +2523,10 @@ connection=postgresql://##CINDER_DB_USER##:##CINDER_DB_PASSWORD##@127.0.0.1/cind
#
# Authentication url for encryption service. (string value)
-#encryption_auth_url=http://127.0.0.1:5000/v2.0
+#encryption_auth_url=http://localhost:5000/v2.0
# Url for encryption service. (string value)
-#encryption_api_url=http://127.0.0.1:9311/v1
+#encryption_api_url=http://localhost:9311/v1
[keystone_authtoken]
@@ -2555,7 +2555,7 @@ auth_protocol=http
auth_uri=$auth_protocol://$auth_host:$auth_port
# Complete admin Identity API endpoint. This should specify
-# the unversioned root endpoint e.g. https://127.0.0.1:35357/
+# the unversioned root endpoint e.g. https://localhost:35357/
# (string value)
#identity_uri=<None>
@@ -2717,7 +2717,7 @@ admin_tenant_name=service
#
# Host to locate redis. (string value)
-#host=127.0.0.1
+#host=localhost
# Use this port to connect to redis host. (integer value)
#port=6379
diff --git a/openstack/etc/glance/glance-api.conf b/openstack/etc/glance/glance-api.conf
index c866f67..e074a73 100644
--- a/openstack/etc/glance/glance-api.conf
+++ b/openstack/etc/glance/glance-api.conf
@@ -231,7 +231,7 @@ registry_client_protocol = http
# notification_driver = noop
# Default publisher_id for outgoing notifications.
-# default_publisher_id = image.127.0.0.1
+# default_publisher_id = image.localhost
# Messaging driver used for 'messaging' notifications driver
rpc_backend=rabbit
@@ -252,7 +252,7 @@ rabbit_durable_queues = False
# the defaults)
#qpid_notification_exchange = glance
#qpid_notification_topic = notifications
-#qpid_hostname = 127.0.0.1
+#qpid_hostname = localhost
#qpid_port = 5672
#qpid_username =
#qpid_password =
@@ -302,8 +302,8 @@ swift_store_auth_version = 2
# Address where the Swift authentication service lives
# Valid schemes are 'http://' and 'https://'
# If no scheme specified, default to 'https://'
-# For swauth, use something like '127.0.0.1:8080/v1.0/'
-swift_store_auth_address = 127.0.0.1:5000/v2.0/
+# For swauth, use something like 'localhost:8080/v1.0/'
+swift_store_auth_address = localhost:5000/v2.0/
# User to authenticate against the Swift authentication service
# If you use Swift authentication service, set it to 'account':'user'
@@ -388,7 +388,7 @@ swift_enable_snet = False
# Address where the S3 authentication service lives
# Valid schemes are 'http://' and 'https://'
# If no scheme specified, default to 'http://'
-s3_store_host = 127.0.0.1:8080/v1.0/
+s3_store_host = localhost:8080/v1.0/
# User to authenticate against the S3 authentication service
s3_store_access_key = <20-char AWS access key>
@@ -454,7 +454,7 @@ s3_store_create_bucket_on_put = False
# ============ Sheepdog Store Options =============================
-sheepdog_store_address = 127.0.0.1
+sheepdog_store_address = localhost
sheepdog_store_port = 7000
@@ -470,7 +470,7 @@ sheepdog_store_chunk_size = 64
#cinder_catalog_info = volume:cinder:publicURL
# Override service catalog lookup with template for cinder endpoint
-# e.g. http://127.0.0.1:8776/v1/%(project_id)s (string value)
+# e.g. http://localhost:8776/v1/%(project_id)s (string value)
#cinder_endpoint_template = <None>
# Region name of this node (string value)
@@ -490,7 +490,7 @@ sheepdog_store_chunk_size = 64
# ESX/ESXi or vCenter Server target system.
# The server value can be an IP address or a DNS name
-# e.g. 127.0.0.1, 127.0.0.1:443, www.vmware-infra.com
+# e.g. localhost, localhost:443, www.vmware-infra.com
#vmware_server_host = <None>
# Server username (string value)
diff --git a/openstack/etc/glance/glance-cache.conf b/openstack/etc/glance/glance-cache.conf
index 0a57d96..a445335 100644
--- a/openstack/etc/glance/glance-cache.conf
+++ b/openstack/etc/glance/glance-cache.conf
@@ -32,7 +32,7 @@ registry_host = 0.0.0.0
registry_port = 9191
# Auth settings if using Keystone
-# auth_url = http://127.0.0.1:5000/v2.0/
+# auth_url = http://localhost:5000/v2.0/
# admin_tenant_name = %SERVICE_TENANT_NAME%
# admin_user = %SERVICE_USER%
# admin_password = %SERVICE_PASSWORD%
@@ -63,8 +63,8 @@ swift_store_auth_version = 2
# Address where the Swift authentication service lives
# Valid schemes are 'http://' and 'https://'
# If no scheme specified, default to 'https://'
-# For swauth, use something like '127.0.0.1:8080/v1.0/'
-swift_store_auth_address = 127.0.0.1:5000/v2.0/
+# For swauth, use something like 'localhost:8080/v1.0/'
+swift_store_auth_address = localhost:5000/v2.0/
# User to authenticate against the Swift authentication service
# If you use Swift authentication service, set it to 'account':'user'
@@ -107,7 +107,7 @@ swift_enable_snet = False
# Address where the S3 authentication service lives
# Valid schemes are 'http://' and 'https://'
# If no scheme specified, default to 'http://'
-s3_store_host = 127.0.0.1:8080/v1.0/
+s3_store_host = localhost:8080/v1.0/
# User to authenticate against the S3 authentication service
s3_store_access_key = <20-char AWS access key>
@@ -140,7 +140,7 @@ s3_store_create_bucket_on_put = False
#cinder_catalog_info = volume:cinder:publicURL
# Override service catalog lookup with template for cinder endpoint
-# e.g. http://127.0.0.1:8776/v1/%(project_id)s (string value)
+# e.g. http://localhost:8776/v1/%(project_id)s (string value)
#cinder_endpoint_template = <None>
# Region name of this node (string value)
@@ -160,7 +160,7 @@ s3_store_create_bucket_on_put = False
# ESX/ESXi or vCenter Server target system.
# The server value can be an IP address or a DNS name
-# e.g. 127.0.0.1, 127.0.0.1:443, www.vmware-infra.com
+# e.g. localhost, localhost:443, www.vmware-infra.com
#vmware_server_host = <None>
# Server username (string value)
diff --git a/openstack/etc/keystone/keystone.conf b/openstack/etc/keystone/keystone.conf
index d9a6026..3d580d7 100644
--- a/openstack/etc/keystone/keystone.conf
+++ b/openstack/etc/keystone/keystone.conf
@@ -281,7 +281,7 @@ rabbit_password=##RABBITMQ_PASSWORD##
#matchmaker_heartbeat_ttl=600
# Host to locate redis. (string value)
-#host=127.0.0.1
+#host=localhost
# Use this port to connect to redis host. (integer value)
#port=6379
@@ -332,7 +332,7 @@ rpc_backend=rabbit
#
# URL to get token from ec2 request. (string value)
-#keystone_ec2_url=http://127.0.0.1:5000/v2.0/ec2tokens
+#keystone_ec2_url=http://localhost:5000/v2.0/ec2tokens
# Required if EC2 server requires client certificate. (string
# value)
@@ -1137,7 +1137,7 @@ connection=postgresql://##KEYSTONE_DB_USER##:##KEYSTONE_DB_PASSWORD##@127.0.0.1/
#
# Memcache servers in the format of "host:port". (list value)
-#servers=127.0.0.1:11211
+#servers=localhost:11211
# Number of compare-and-set attempts to make when using
# compare-and-set in the token memcache back end. (integer
diff --git a/openstack/etc/neutron/neutron.conf b/openstack/etc/neutron/neutron.conf
index e85cc9a..8248feb 100644
--- a/openstack/etc/neutron/neutron.conf
+++ b/openstack/etc/neutron/neutron.conf
@@ -286,7 +286,7 @@ nova_admin_auth_url = ##KEYSTONE_ADMIN_URL##
#rpc_conn_pool_size=30
# Qpid broker hostname. (string value)
-#qpid_hostname=127.0.0.1
+#qpid_hostname=localhost
# Qpid broker port. (integer value)
#qpid_port=5672
@@ -459,7 +459,7 @@ rpc_backend=rabbit
#
# Host to locate redis. (string value)
-#host=127.0.0.1
+#host=localhost
# Use this port to connect to redis host. (integer value)
#port=6379
@@ -566,8 +566,8 @@ admin_password = ##NEUTRON_SERVICE_PASSWORD##
[database]
# This line MUST be changed to actually run the plugin.
# Example:
-# connection = mysql://root:pass@127.0.0.1:3306/neutron
-# Replace 127.0.0.1 above with the IP address of the database used by the
+# connection = mysql://root:pass@localhost:3306/neutron
+# Replace localhost above with the IP address of the database used by the
# main neutron server. (Leave it as is if the database runs on this host.)
# connection = sqlite://
# NOTE: In deployment the [database] section and its connection attribute may
diff --git a/openstack/etc/nova/nova.conf b/openstack/etc/nova/nova.conf
index b66a511..09052cd 100644
--- a/openstack/etc/nova/nova.conf
+++ b/openstack/etc/nova/nova.conf
@@ -204,7 +204,7 @@ protocol=http
# with https:// for ssl-based glance api servers.
# ([hostname|ip]:port) (list value)
api_servers=$glance_host:$glance_port
-#api_servers=127.0.0.1:9292
+#api_servers=localhost:9292
# Allow to perform insecure SSL (https) requests to glance (boolean value)
#api_insecure=false
@@ -580,7 +580,7 @@ use_local=true
[spice]
# location of spice html5 console proxy, in the form
# "http://www.example.com:6082/spice_auto.html" (string value)
-html5proxy_base_url=http://127.0.0.1:6082/spice_auto.html
+#html5proxy_base_url=http://localhost:6082/spice_auto.html
# IP address on which instance spice server should listen (string value)
server_listen=0.0.0.0