commit 1f2102c4f8595b8c6514993b9733b8faee1a5dda
author Jenkins <jenkins@review.openstack.org> Tue Apr 23 12:41:26 2013 +0000
committer Gerrit Code Review <review@openstack.org> Tue Apr 23 12:41:26 2013 +0000
tree ef96d27d845845031f45517e811176799121e0c8
parent 34d74bcc663f52221a4a2154522826bf1503b557
parent 43a655c312de0c2f9bd0b053f3e0a0c5ef64476e

Merge "Parameterized configuration variables for PLUMgrid plugin"

lib/quantum_plugins/plumgrid

diff --git a/lib/quantum_plugins/plumgrid b/lib/quantum_plugins/plumgrid
index b49aa92..912aa7e 100644
--- a/lib/quantum_plugins/plumgrid
+++ b/lib/quantum_plugins/plumgrid
@@ -25,8 +25,10 @@
 }
 
 function quantum_plugin_configure_service() {
-    iniset /$Q_PLUGIN_CONF_FILE PLUMgridNOS nos_server localhost
-    iniset /$Q_PLUGIN_CONF_FILE PLUMgridNOS nos_server_port 7766
+    PLUMGRID_NOS_IP=${PLUMGRID_NOS_IP:-localhost}
+    PLUMGRID_NOS_PORT=${PLUMGRID_NOS_PORT:-7766}
+    iniset /$Q_PLUGIN_CONF_FILE PLUMgridNOS nos_server $PLUMGRID_NOS_IP
+    iniset /$Q_PLUGIN_CONF_FILE PLUMgridNOS nos_server_port $PLUMGRID_NOS_PORT
 }
 
 function quantum_plugin_configure_debug_command() {