Merge "Closes-Bug: #1448815" into R2.20

Juniper · May 21, 2015 · 119aa07 · 119aa07
2 parents 7cb25f5 + 8d5b0a9
commit 119aa07
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/contrail_provisioning/vcenter_plugin/setup.py b/contrail_provisioning/vcenter_plugin/setup.py
@@ -37,6 +37,7 @@ def parse_args(self, args_str):
         parser.add_argument("--vcenter_password", help = "vcenter login password")
         parser.add_argument("--vcenter_datacenter", help = "vcenter datacenter name")
         parser.add_argument("--vcenter_dvswitch", help = "vcenter dvswitch name")
+        parser.add_argument("--vcenter_ipfabricpg", help = "vcenter ipfabric port group")
         parser.add_argument("--api_hostname", help = "IP Address of the config node")
         parser.add_argument("--api_port", help = "Listen port for api server", type = int)
         parser.add_argument("--zookeeper_serverlist", help = "List of zookeeper ip:port")
@@ -52,6 +53,7 @@ def fixup_contrail_vcenter_plugin(self):
                          '__contrail_vcenter_password__' : self._args.vcenter_password,
                          '__contrail_vcenter_datacenter__' : self._args.vcenter_datacenter,
                          '__contrail_vcenter_dvswitch__' : self._args.vcenter_dvswitch,
+                         '__contrail_vcenter_ipfabricpg__' : self._args.vcenter_ipfabricpg,
                          '__contrail_api_hostname__' : self._args.api_hostname,
                          '__contrail_zookeeper_serverlist__' : self._args.zookeeper_serverlist,
                          '__contrail_api_port__' : self._args.api_port

diff --git a/contrail_provisioning/vcenter_plugin/templates/contrail_vcenter_plugin_conf.py b/contrail_provisioning/vcenter_plugin/templates/contrail_vcenter_plugin_conf.py
@@ -18,6 +18,7 @@
 
 vcenter.datacenter=$__contrail_vcenter_datacenter__
 vcenter.dvswitch=$__contrail_vcenter_dvswitch__
+vcenter.ipfabricpg=$__contrail_vcenter_ipfabricpg__
 
 # IP address and port to be used to connect to api server.
 api.hostname=$__contrail_api_hostname__