summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-03-27 15:43:51 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-03-27 16:13:00 +0000
commitb7342b2f04442299f806a0f50031c85af8a92b23 (patch)
treeb37b293283a9ae8bc91341c06dea330894fb3fa5
parent617dc9b1fef4f91b248b70adf5e0ff740876d6b6 (diff)
downloaddefinitions-b7342b2f04442299f806a0f50031c85af8a92b23.tar.gz
neutron: Remove 'onenode' from configuration files
-rw-r--r--openstack/usr/share/openstack/neutron/neutron.conf2
-rw-r--r--openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf.ini2
2 files changed, 2 insertions, 2 deletions
diff --git a/openstack/usr/share/openstack/neutron/neutron.conf b/openstack/usr/share/openstack/neutron/neutron.conf
index 4608e732..6545d00f 100644
--- a/openstack/usr/share/openstack/neutron/neutron.conf
+++ b/openstack/usr/share/openstack/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://onenode:8774/v2
+nova_url = http://{{ CONTROLLER_HOST_ADDRESS }}:8774/v2
# Name of nova region to use. Useful if keystone manages more than one region
nova_region_name = regionOne
diff --git a/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf.ini b/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf.ini
index 58e5fe21..78d938b9 100644
--- a/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf.ini
+++ b/openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf.ini
@@ -77,7 +77,7 @@ enable_security_group = True
enable_ipset = True
[ovs]
-local_ip = onenode
+local_ip = {{ MANAGEMENT_INTERFACE_IP_ADDRESS }}
enable_tunneling = True
bridge_mappings=External:br-ex,Physnet1:br-eth1