Merge branch 'master' of https://github.com/selvakumarnms/baremetal-n…

…etwork-provisioning Conflicts: baremetal_network_provisioning/ml2/hpeironicextensiondriver.py
stephenbma · Feb 17, 2016 · b0176d3 · b0176d3
2 parents 41cfeaa + bca8c2c
commit b0176d3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
@@ -26,9 +26,9 @@ function configure_bnp_plugin {
        sudo chown -R $STACK_USER:root /etc/neutron
     fi
     cp $BNP_DIR/etc/ml2_conf_hpe.ini $BNP_ML2_CONF_HPE_FILE
-    iniset $BNP_ML2_CONF_HP_FILE default snmp_timeout $SNMP_TIMEOUT
-    iniset $BNP_ML2_CONF_HP_FILE default snmp_retries $SNMP_RETRIES
-    iniadd $BNP_ML2_CONF_HP_FILE ml2_hpe net_provisioning_driver $NET_PROVISIONING_DRIVER
+    iniset $BNP_ML2_CONF_HPE_FILE default snmp_timeout $SNMP_TIMEOUT
+    iniset $BNP_ML2_CONF_HPE_FILE default snmp_retries $SNMP_RETRIES
+    iniadd $BNP_ML2_CONF_HPE_FILE ml2_hpe net_provisioning_driver $NET_PROVISIONING_DRIVER
     iniset $BNP_ENTRY_POINT_FILE neutron.ml2.mechanism_drivers hpe_bnp $HPE_MECHANISM_DRIVER
     iniset $BNP_ENTRY_POINT_FILE neutron.ml2.extension_drivers bnp_ext_driver $BNP_EXTENSION_DRIVER
 }