diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-03-25 11:17:13 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-03-25 11:17:13 +0000 |
| commit | d77f6b9e2ea5d7628612c6f8804fbb91685a7bc7 (patch) | |
| tree | 6f893f507459ff47843cb1b6422d06a106a76b53 | |
| parent | 0f98bfd652655b012f1665324f5b0338cb274203 (diff) | |
| download | definitions-d77f6b9e2ea5d7628612c6f8804fbb91685a7bc7.tar.gz | |
neutron: onenode hardcoded in ml2_conf
| -rw-r--r-- | openstack-neutron.configure | 3 | ||||
| -rw-r--r-- | openstack/usr/share/openstack/neutron/plugins/ml2/ml2_conf.ini | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/openstack-neutron.configure b/openstack-neutron.configure index ac98e0cb..68a4e8b7 100644 --- a/openstack-neutron.configure +++ b/openstack-neutron.configure @@ -50,6 +50,7 @@ if [ -z "$NEUTRON_SERVICE_USER" -a \ -z "$RABBITMQ_PASSWORD" -a \ -z "$RABBITMQ_PORT" -a \ -z "$CONTROLLER_HOST_ADDRESS" -a \ + -z "$MANAGEMENT_INTERFACE_IP_ADDRESS" -a \ -z "$KEYSTONE_TEMPORARY_ADMIN_TOKEN" ]; then # No NOVA options defined, do nothing. exit 0 @@ -67,6 +68,7 @@ if [ -z "$NEUTRON_SERVICE_USER" -o \ -z "$RABBITMQ_PASSWORD" -o \ -z "$RABBITMQ_PORT" -o \ -z "$CONTROLLER_HOST_ADDRESS" -o \ + -z "$MANAGEMENT_INTERFACE_IP_ADDRESS" -o \ -z "$KEYSTONE_TEMPORARY_ADMIN_TOKEN" ]; then echo Some options required for Nova were defined, but not all. exit 1 @@ -95,6 +97,7 @@ nova_configuration={ 'RABBITMQ_PASSWORD': os.environ['RABBITMQ_PASSWORD'], 'RABBITMQ_PORT': os.environ['RABBITMQ_PORT'], 'CONTROLLER_HOST_ADDRESS': os.environ['CONTROLLER_HOST_ADDRESS'], + 'MANAGEMENT_INTERFACE_IP_ADDRESS': os.environ['MANAGEMENT_INTERFACE_IP_ADDRESS'], 'KEYSTONE_TEMPORARY_ADMIN_TOKEN': os.environ['KEYSTONE_TEMPORARY_ADMIN_TOKEN'], } 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 |