From 9d6a2122707708b4bdad41ebf176b83e57540cbd Mon Sep 17 00:00:00 2001
From: Rohan Parulekar <2k.rohan@gmail.com>
Date: Wed, 23 Mar 2016 11:26:44 -0400
Subject: [PATCH] Nuage nova configuration ansible changes

Change-Id: I2f787669441e4881f340c76afbb93c7678610dcb
---
 defaults/main.yml      | 8 ++++++++
 templates/nova.conf.j2 | 5 ++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index ee415a09..c22186dd 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -244,6 +244,14 @@ nova_resume_guests_state_on_host_boot: False
 nova_dhcp_domain: novalocal
 nova_default_schedule_zone: nova
 glance_api_servers: "{{ glance_host }}:{{ glance_service_port }}"
+nova_network_type: linuxbridge
+
+nova_network_services:
+  linuxbridge:
+    use_forwarded_for: False
+  nuage:
+    use_forwarded_for: True
+    ovs_bridge: alubr0
 
 # Nova quota
 nova_quota_cores: 20
diff --git a/templates/nova.conf.j2 b/templates/nova.conf.j2
index 2721cecb..0d7e6b64 100644
--- a/templates/nova.conf.j2
+++ b/templates/nova.conf.j2
@@ -93,6 +93,7 @@ dhcp_domain = {{ nova_dhcp_domain }}
 force_dhcp_release = True
 dhcpbridge_flagfile = /etc/nova/nova.conf
 firewall_driver = {{ nova_firewall_driver }}
+use_forwarded_for = {{ nova_network_services[nova_network_type]['use_forwarded_for'] | bool }}
 my_ip = {{ nova_management_address }}
 default_floating_pool = public
 security_group_api = neutron
@@ -177,7 +178,9 @@ auth_url = {{ keystone_service_adminurl }}
 insecure = {{ keystone_service_adminuri_insecure | bool }}
 metadata_proxy_shared_secret = {{ nova_metadata_proxy_secret }}
 service_metadata_proxy = {{ nova_metadata_proxy_enabled }}
-
+{% if nova_network_services[nova_network_type]['ovs_bridge'] is defined %}
+ovs_bridge = {{ nova_network_services[nova_network_type]['ovs_bridge'] }}
+{% endif %}
 
 [conductor]
 topic = conductor