From c28ea81fc6bdecd30c8a79dc9e32cf3ae33dd801 Mon Sep 17 00:00:00 2001
From: Artem Savinov <asavinov@mirantis.com>
Date: Thu, 29 Oct 2015 10:52:45 +0300
Subject: [PATCH] Add additional parameters to plugin in Neutron NSX plugin
 (Liberty)

* Add new fields to environtment_config.yaml and apply new settings in
  nsx.ini template

Change-Id: I9b7f8aeb9fbc67f5e31373756d5b8ee48bde35e9
---
 .../puppet/modules/nsxv/templates/nsx.ini.erb | 45 ++++++++++++++++++
 environment_config.yaml                       | 46 +++++++++++++++++++
 2 files changed, 91 insertions(+)

diff --git a/deployment_scripts/puppet/modules/nsxv/templates/nsx.ini.erb b/deployment_scripts/puppet/modules/nsxv/templates/nsx.ini.erb
index d964c1b..3742757 100644
--- a/deployment_scripts/puppet/modules/nsxv/templates/nsx.ini.erb
+++ b/deployment_scripts/puppet/modules/nsxv/templates/nsx.ini.erb
@@ -146,3 +146,48 @@ tenant_router_types = <%= settings['nsxv_tenant_router_types'] %>
 
 # Enable HA for NSX Edges
 edge_ha = <%= settings['nsxv_edge_ha'] %>
+
+# (Optional) Edge appliance size to be used for creating exclusive router.
+# Valid values: ['compact', 'large', 'xlarge', 'quadlarge']
+# This exclusive_router_appliance_size will be picked up if --router-size
+# parameter is not specified while doing neutron router-create
+# exclusive_router_appliance_size = compact
+<% if not (settings['nsxv_exclusive_router_appliance_size']).to_s.strip.empty? -%>
+exclusive_router_appliance_size = <%= settings['nsxv_exclusive_router_appliance_size'] %>
+<% else -%>
+# exclusive_router_appliance_size = compact
+<% end -%>
+
+# (Optional) Enable an administrator to configure the edge user and password
+# Username to configure for Edge appliance login
+<% if not (settings['nsxv_edge_appliance_user']).to_s.strip.empty? -%>
+edge_appliance_user = <%= settings['nsxv_edge_appliance_user'] %>
+<% else -%>
+# edge_appliance_user =
+<% end -%>
+
+# (Optional) Password to configure for Edge appliance login
+# edge_appliance_password =
+<% if not (settings['nsxv_edge_appliance_password']).to_s.strip.empty? -%>
+edge_appliance_password = <%= settings['nsxv_edge_appliance_password'] %>
+<% else -%>
+# edge_appliance_password =
+<% end -%>
+
+# (Optional) URL for distributed locking coordination resource for lock manager
+# This value is passed as a parameter to tooz coordinator.
+# By default, value is None and oslo_concurrency is used for single-node
+# lock management.
+<% if not (settings['nsxv_locking_coordinator_url']).to_s.strip.empty? -%>
+locking_coordinator_url = <%= settings['nsxv_locking_coordinator_url'] %>
+<% else -%>
+# locking_coordinator_url =
+<% end -%>
+
+# (Optional) DHCP lease time
+# dhcp_lease_time = 86400
+<% if not (settings['nsxv_dhcp_lease_time']).to_s.strip.empty? -%>
+dhcp_lease_time = <%= settings['nsxv_dhcp_lease_time'] %>
+<% else -%>
+# dhcp_lease_time = 86400
+<% end -%>
diff --git a/environment_config.yaml b/environment_config.yaml
index dbf8bf9..72a1d6b 100644
--- a/environment_config.yaml
+++ b/environment_config.yaml
@@ -193,3 +193,49 @@ attributes:
     restrictions:
       - condition: 'settings:nsxv.nsxv_additional.value == false'
         action: 'hide'
+  nsxv_exclusive_router_appliance_size:
+    value: ''
+    label: 'Exclusive router type'
+    description: 'Edge form factor for exclusive router'
+    regex: ^(compact|large|quadlarge|xlarge)$
+    weight: 130
+    type: 'text'
+    restrictions:
+      - condition: 'settings:nsxv.nsxv_additional.value == false'
+        action: 'hide'
+  nsxv_edge_appliance_user:
+    value: ''
+    label: 'Edge user'
+    description: 'User for Edge node login'
+    weight: 135
+    type: 'text'
+    restrictions:
+      - condition: 'settings:nsxv.nsxv_additional.value == false'
+        action: 'hide'
+  nsxv_edge_appliance_password:
+    value: ''
+    label: 'Edge password'
+    description: 'Password for Edge node login'
+    weight: 140
+    type: 'password'
+    restrictions:
+      - condition: 'settings:nsxv.nsxv_additional.value == false'
+        action: 'hide'
+  nsxv_dhcp_lease_time:
+    value: ''
+    label: 'DHCP lease time'
+    description: ''
+    weight: 145
+    type: 'text'
+    restrictions:
+      - condition: 'settings:nsxv.nsxv_additional.value == false'
+        action: 'hide'
+  nsxv_locking_coordinator_url:
+    value: ''
+    label: 'Coordinator url'
+    description: 'URL for distributed locking coordinator'
+    weight: 150
+    type: 'text'
+    restrictions:
+      - condition: 'settings:nsxv.nsxv_additional.value == false'
+        action: 'hide'