Browse code
Merge "Set a correct whitelist for drivers in Ironic"
Jenkins authored on 2014/04/11 09:23:01Showing 1 changed files
| ... | ... |
@@ -42,6 +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 | 46 |
IRONIC_SSH_USERNAME=${IRONIC_SSH_USERNAME:-`whoami`}
|
| 46 | 47 |
IRONIC_SSH_KEY_DIR=${IRONIC_SSH_KEY_DIR:-$IRONIC_DATA_DIR/ssh_keys}
|
| 47 | 48 |
IRONIC_SSH_KEY_FILENAME=${IRONIC_SSH_KEY_FILENAME:-ironic_key}
|
| ... | ... |
@@ -171,6 +172,7 @@ function configure_ironic_conductor {
|
| 171 | 171 |
cp -r $IRONIC_DIR/etc/ironic/rootwrap.d $IRONIC_CONF_DIR |
| 172 | 172 |
|
| 173 | 173 |
iniset $IRONIC_CONF_FILE DEFAULT rootwrap_config $IRONIC_ROOTWRAP_CONF |
| 174 |
+ iniset $IRONIC_CONF_FILE DEFAULT drivers_whitelist $IRONIC_DRIVERS_WHITELIST |
|
| 174 | 175 |
iniset $IRONIC_CONF_FILE conductor api_url http://$HOST_IP:6385 |
| 175 | 176 |
iniset $IRONIC_CONF_FILE pxe tftp_server $HOST_IP |
| 176 | 177 |
iniset $IRONIC_CONF_FILE pxe tftp_root $IRONIC_TFTPBOOT_DIR |