From 93944da8eebad7e7224c35b45ad9bbdc4eb6b73f Mon Sep 17 00:00:00 2001
From: "grace.yu" <xinyu@huawei.com>
Date: Tue, 16 Sep 2014 11:21:52 -0700
Subject: [PATCH] fix instance cannot get IP from dhcp

In order to fix the issue, this change must work with the commit
with same commit message of openstack network cookbook.

Change-Id: I5e312b03f75f8a6f4b2446823236775e8378d58f
---
 .../openstack_icehouse/environments/multinodes.tmpl           | 4 +++-
 requirements.txt                                              | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/conf/templates/chef_installer/openstack_icehouse/environments/multinodes.tmpl b/conf/templates/chef_installer/openstack_icehouse/environments/multinodes.tmpl
index 5c99d8ca..aab26ebc 100644
--- a/conf/templates/chef_installer/openstack_icehouse/environments/multinodes.tmpl
+++ b/conf/templates/chef_installer/openstack_icehouse/environments/multinodes.tmpl
@@ -19,6 +19,7 @@
 ## Network worker node management IP/interface
 #set network_worker_ip = $network_worker_role.management.ip
 #set network_worker_nic = $network_worker_role.management.interface
+#set network_worker_tenant_nic = $network_worker_role.tenant.interface
 #set network_worker_public_nic = $network_worker_role.public.interface
 
 ## Database node management IP
@@ -143,7 +144,8 @@
         "openvswitch": {
           "tenant_network_type": "gre",
           "enable_tunneling": "True",
-          "tunnel_id_ranges": "1:1000"
+          "tunnel_id_ranges": "1:1000",
+          "bind_interface": "$network_worker_tenant_nic"
         },
         "l3": {
             "external_network_bridge_interface": "$network_worker_public_nic"
diff --git a/requirements.txt b/requirements.txt
index a0c156f7..874c723d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,6 @@
 argparse
 celery
+Markdown==2.4.1
 Cheetah==2.4.1
 daemon
 Flask