Browse code
Adds entries for missing parameters in PLUMgrid plugin
Three configuration parameters were missing for the PLUMgrid plugin.
In this patch all those three have been properly added.
Change-Id: If070aa5eb35678d0984470ebcd43fd99e08bcc8a
Closes-Bug: #1255808
(cherry picked from commit 500a32f4f8e8526ba075b61f336cf91dc9d8c652)
Edgar Magana authored on 2013/12/03 07:27:31Showing 1 changed files
| ... | ... |
@@ -6,8 +6,6 @@ |
| 6 | 6 |
MY_XTRACE=$(set +o | grep xtrace) |
| 7 | 7 |
set +o xtrace |
| 8 | 8 |
|
| 9 |
-#source $TOP_DIR/lib/neutron_plugins/ovs_base |
|
| 10 |
- |
|
| 11 | 9 |
function neutron_plugin_create_nova_conf() {
|
| 12 | 10 |
|
| 13 | 11 |
NOVA_VIF_DRIVER=${NOVA_VIF_DRIVER:-"nova.virt.libvirt.vif.LibvirtGenericVIFDriver"}
|
| ... | ... |
@@ -24,11 +22,17 @@ function neutron_plugin_configure_common() {
|
| 24 | 24 |
Q_PLUGIN_CLASS="neutron.plugins.plumgrid.plumgrid_plugin.plumgrid_plugin.NeutronPluginPLUMgridV2" |
| 25 | 25 |
PLUMGRID_DIRECTOR_IP=${PLUMGRID_DIRECTOR_IP:-localhost}
|
| 26 | 26 |
PLUMGRID_DIRECTOR_PORT=${PLUMGRID_DIRECTOR_PORT:-7766}
|
| 27 |
+ PLUMGRID_ADMIN=${PLUMGRID_ADMIN:-username}
|
|
| 28 |
+ PLUMGRID_PASSWORD=${PLUMGRID_PASSWORD:-password}
|
|
| 29 |
+ PLUMGRID_TIMEOUT=${PLUMGRID_TIMEOUT:-70}
|
|
| 27 | 30 |
} |
| 28 | 31 |
|
| 29 | 32 |
function neutron_plugin_configure_service() {
|
| 30 | 33 |
iniset /$Q_PLUGIN_CONF_FILE PLUMgridDirector director_server $PLUMGRID_DIRECTOR_IP |
| 31 | 34 |
iniset /$Q_PLUGIN_CONF_FILE PLUMgridDirector director_server_port $PLUMGRID_DIRECTOR_PORT |
| 35 |
+ iniset /$Q_PLUGIN_CONF_FILE PLUMgridDirector username $PLUMGRID_ADMIN |
|
| 36 |
+ iniset /$Q_PLUGIN_CONF_FILE PLUMgridDirector password $PLUMGRID_PASSWORD |
|
| 37 |
+ iniset /$Q_PLUGIN_CONF_FILE PLUMgridDirector servertimeout $PLUMGRID_TIMEOUT |
|
| 32 | 38 |
} |
| 33 | 39 |
|
| 34 | 40 |
function neutron_plugin_configure_debug_command() {
|