Merge "Correct syntax error in stack.sh"
diff --git a/files/apts/n-cpu b/files/apts/n-cpu
index a40b659..ad2d6d7 100644
--- a/files/apts/n-cpu
+++ b/files/apts/n-cpu
@@ -3,3 +3,5 @@
open-iscsi
open-iscsi-utils
genisoimage
+sysfsutils
+sg3-utils
diff --git a/files/rpms-suse/n-cpu b/files/rpms-suse/n-cpu
index 27d3254..7040b84 100644
--- a/files/rpms-suse/n-cpu
+++ b/files/rpms-suse/n-cpu
@@ -2,3 +2,5 @@
genisoimage
lvm2
open-iscsi
+sysfsutils
+sg3_utils
diff --git a/files/rpms/n-cpu b/files/rpms/n-cpu
index f7054e8..149672a 100644
--- a/files/rpms/n-cpu
+++ b/files/rpms/n-cpu
@@ -2,3 +2,5 @@
iscsi-initiator-utils
lvm2
genisoimage
+sysfsutils
+sg3_utils
diff --git a/functions b/functions
index 79c82a4..ae63436 100644
--- a/functions
+++ b/functions
@@ -747,17 +747,19 @@
screen_rc "$1" "$2"
screen -S $SCREEN_NAME -X screen -t $1
+
+ if [[ -n ${SCREEN_LOGDIR} ]]; then
+ screen -S $SCREEN_NAME -p $1 -X logfile ${SCREEN_LOGDIR}/screen-${1}.${CURRENT_LOG_TIME}.log
+ screen -S $SCREEN_NAME -p $1 -X log on
+ ln -sf ${SCREEN_LOGDIR}/screen-${1}.${CURRENT_LOG_TIME}.log ${SCREEN_LOGDIR}/screen-${1}.log
+ fi
+
if [[ "$SCREEN_DEV" = "True" ]]; then
# sleep to allow bash to be ready to be send the command - we are
# creating a new window in screen and then sends characters, so if
# bash isn't running by the time we send the command, nothing happens
sleep 1.5
- if [[ -n ${SCREEN_LOGDIR} ]]; then
- screen -S $SCREEN_NAME -p $1 -X logfile ${SCREEN_LOGDIR}/screen-${1}.${CURRENT_LOG_TIME}.log
- screen -S $SCREEN_NAME -p $1 -X log on
- ln -sf ${SCREEN_LOGDIR}/screen-${1}.${CURRENT_LOG_TIME}.log ${SCREEN_LOGDIR}/screen-${1}.log
- fi
NL=`echo -ne '\015'`
screen -S $SCREEN_NAME -p $1 -X stuff "$2 || touch \"$SERVICE_DIR/$SCREEN_NAME/$1.failure\"$NL"
else
diff --git a/stack.sh b/stack.sh
index c9ca43f..331743f 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1073,9 +1073,11 @@
iniset $NOVA_CONF DEFAULT compute_driver nova.virt.baremetal.driver.BareMetalDriver
iniset $NOVA_CONF DEFAULT firewall_driver $LIBVIRT_FIREWALL_DRIVER
iniset $NOVA_CONF DEFAULT scheduler_host_manager nova.scheduler.baremetal_host_manager.BaremetalHostManager
- iniset $NOVA_CONF DEFAULT scheduler_default_filters AllHostsFilter
- iniset $NOVA_CONF baremetal driver $BM_DRIVER
+ # NOTE(deva): ComputeCapabilitiesFilter does not currently work with Baremetal. See bug # 1129485
+ # As a work around, we disable CCFilter by explicitly enabling all the other default filters.
+ iniset $NOVA_CONF DEFAULT scheduler_default_filters ComputeFilter,RetryFilter,AvailabilityZoneFilter,ImagePropertiesFilter
iniset $NOVA_CONF baremetal instance_type_extra_specs cpu_arch:$BM_CPU_ARCH
+ iniset $NOVA_CONF baremetal driver $BM_DRIVER
iniset $NOVA_CONF baremetal power_manager $BM_POWER_MANAGER
iniset $NOVA_CONF baremetal tftp_root /tftpboot