Browse code
Rename ironic option drivers_whitelist -> enabled_drivers
There were competing patches to implement this feature in Ironic.
Patch I2da37409cea98731a2ca18dfe7298861fde37783 calls the option
'enabled_drivers', which is more consistent with other option names.
Change-Id: Ifa7eae594c6d9ea743a17b4c31e407501bba8467
Devananda van der Veen authored on 2014/04/12 02:08:41Showing 1 changed files
| ... | ... |
@@ -42,7 +42,7 @@ IRONIC_POLICY_JSON=$IRONIC_CONF_DIR/policy.json |
| 42 | 42 |
IRONIC_SCRIPTS_DIR=${IRONIC_SCRIPTS_DIR:-$TOP_DIR/tools/ironic/scripts}
|
| 43 | 43 |
IRONIC_TEMPLATES_DIR=${IRONIC_TEMPLATES_DIR:-$TOP_DIR/tools/ironic/templates}
|
| 44 | 44 |
IRONIC_BAREMETAL_BASIC_OPS=$(trueorfalse False $IRONIC_BAREMETAL_BASIC_OPS) |
| 45 |
-IRONIC_DRIVERS_WHITELIST=${IRONIC_DRIVERS_WHITELIST:-fake,pxe_ssh}
|
|
| 45 |
+IRONIC_ENABLED_DRIVERS=${IRONIC_ENABLED_DRIVERS:-fake,pxe_ssh,pxe_ipmitool}
|
|
| 46 | 46 |
IRONIC_SSH_USERNAME=${IRONIC_SSH_USERNAME:-`whoami`}
|
| 47 | 47 |
IRONIC_SSH_KEY_DIR=${IRONIC_SSH_KEY_DIR:-$IRONIC_DATA_DIR/ssh_keys}
|
| 48 | 48 |
IRONIC_SSH_KEY_FILENAME=${IRONIC_SSH_KEY_FILENAME:-ironic_key}
|
| ... | ... |
@@ -181,7 +181,7 @@ function configure_ironic_conductor {
|
| 181 | 181 |
sudo mv $TEMPFILE /etc/sudoers.d/ironic-rootwrap |
| 182 | 182 |
|
| 183 | 183 |
iniset $IRONIC_CONF_FILE DEFAULT rootwrap_config $IRONIC_ROOTWRAP_CONF |
| 184 |
- iniset $IRONIC_CONF_FILE DEFAULT drivers_whitelist $IRONIC_DRIVERS_WHITELIST |
|
| 184 |
+ iniset $IRONIC_CONF_FILE DEFAULT enabled_drivers $IRONIC_ENABLED_DRIVERS |
|
| 185 | 185 |
iniset $IRONIC_CONF_FILE conductor api_url http://$HOST_IP:6385 |
| 186 | 186 |
iniset $IRONIC_CONF_FILE pxe tftp_server $HOST_IP |
| 187 | 187 |
iniset $IRONIC_CONF_FILE pxe tftp_root $IRONIC_TFTPBOOT_DIR |