From 1765c97ce1d291a46f12a2dff5cb37042b98c5df Mon Sep 17 00:00:00 2001
From: Logan V <logan2211@gmail.com>
Date: Sun, 14 Aug 2016 00:37:47 -0500
Subject: [PATCH] Add networking-calico configuration for nova-api-metadata

Change-Id: I02ba101a3dfdbb34b96a110f429cfa6d1f0e9863
---
 defaults/main.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 0eb87f6f..2b9094ad 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -219,7 +219,7 @@ nova_novncproxy_git_install_branch: master
 nova_novncproxy_vnc_keymap: en-us
 
 ## Nova metadata
-nova_metadata_proxy_enabled: True
+nova_metadata_proxy_enabled: "{{ nova_network_services[nova_network_type]['metadata_proxy_enabled'] | bool }}"
 nova_metadata_host: "{{ internal_lb_vip_address }}"
 nova_metadata_port: 8775
 nova_metadata_program_name: nova-api-metadata
@@ -283,9 +283,14 @@ nova_network_type: linuxbridge
 nova_network_services:
   linuxbridge:
     use_forwarded_for: False
+    metadata_proxy_enabled: True
   nuage:
     use_forwarded_for: True
+    metadata_proxy_enabled: True
     ovs_bridge: alubr0
+  calico:
+    use_forwarded_for: True
+    metadata_proxy_enabled: False
 
 # Nova quota
 nova_quota_cores: 20