From: Jerry Zhao <zhaoxinyu@huawei.com>
Date: Mon, 24 Nov 2014 21:18:52 +0000 (-0800)
Subject: Fix empty local_ip in ml2_conf.ini on undercloud
X-Git-Tag: opnfv-6.0.0~2720
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=d5aeed2060088dd46b67d8a5dc96594829c5b104;p=apex-tripleo-heat-templates.git

Fix empty local_ip in ml2_conf.ini on undercloud

empty local_ip in ml2_conf.ini would make neutron-openvswitch-agent
fail to start, then fail to bridge dhcp to br-ctlplane and pxe boot an
overcloud, so provide the value in undercloud-source.yaml.

Related-Bug: #1394956

Change-Id: If3a94b9c2b971ceb7601f91a2db64989960fb5d3
---

diff --git a/undercloud-source.yaml b/undercloud-source.yaml
index 7c03d183..18527e53 100644
--- a/undercloud-source.yaml
+++ b/undercloud-source.yaml
@@ -315,6 +315,8 @@ resources:
           host: 127.0.0.1
           ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8
           ovs:
+            local_ip:
+              get_input: controller_host
             public_interface:
               get_param: NeutronPublicInterface
             public_interface_raw_device: