Merge "package: consolidate get_packages logic"
diff --git a/files/apts/nova b/files/apts/nova
index 39b4060..ba6d8c5 100644
--- a/files/apts/nova
+++ b/files/apts/nova
@@ -8,7 +8,6 @@
python-mysqldb
python-xattr # needed for glance which is needed for nova --- this shouldn't be here
python-lxml # needed for glance which is needed for nova --- this shouldn't be here
-kvm
gawk
iptables
ebtables
diff --git a/lib/quantum b/lib/quantum
index 0fef1ae..3466162 100644
--- a/lib/quantum
+++ b/lib/quantum
@@ -442,7 +442,6 @@
iniset $Q_DHCP_CONF_FILE DEFAULT verbose True
iniset $Q_DHCP_CONF_FILE DEFAULT debug True
iniset $Q_DHCP_CONF_FILE DEFAULT use_namespaces $Q_USE_NAMESPACE
- iniset $Q_DHCP_CONF_FILE DEFAULT state_path $DATA_DIR/quantum
iniset $Q_DHCP_CONF_FILE DEFAULT root_helper "$Q_RR_COMMAND"
_quantum_setup_keystone $Q_DHCP_CONF_FILE DEFAULT set_auth_url
@@ -464,7 +463,6 @@
iniset $Q_L3_CONF_FILE DEFAULT verbose True
iniset $Q_L3_CONF_FILE DEFAULT debug True
iniset $Q_L3_CONF_FILE DEFAULT use_namespaces $Q_USE_NAMESPACE
- iniset $Q_L3_CONF_FILE DEFAULT state_path $DATA_DIR/quantum
iniset $Q_L3_CONF_FILE DEFAULT root_helper "$Q_RR_COMMAND"
_quantum_setup_keystone $Q_L3_CONF_FILE DEFAULT set_auth_url
@@ -481,7 +479,6 @@
iniset $Q_META_CONF_FILE DEFAULT verbose True
iniset $Q_META_CONF_FILE DEFAULT debug True
- iniset $Q_META_CONF_FILE DEFAULT state_path $DATA_DIR/quantum
iniset $Q_META_CONF_FILE DEFAULT nova_metadata_ip $Q_META_DATA_IP
iniset $Q_META_CONF_FILE DEFAULT root_helper "$Q_RR_COMMAND"
@@ -520,6 +517,7 @@
iniset $QUANTUM_CONF DEFAULT verbose True
iniset $QUANTUM_CONF DEFAULT debug True
+ iniset $QUANTUM_CONF DEFAULT state_path $DATA_DIR/quantum
iniset $QUANTUM_CONF DEFAULT allow_overlapping_ips $Q_ALLOW_OVERLAPPING_IP
iniset $QUANTUM_CONF DEFAULT auth_strategy $Q_AUTH_STRATEGY
diff --git a/stack.sh b/stack.sh
index 7d43278..a4106e5 100755
--- a/stack.sh
+++ b/stack.sh
@@ -410,7 +410,6 @@
## FIXME(ja): should/can we check that FLAT_INTERFACE is sane?
-
# Database Configuration
# ----------------------
@@ -845,6 +844,18 @@
# Initialize the directory for service status check
init_service_check
+# Kick off Sysstat
+# ------------------------
+# run sysstat if it is enabled, this has to be early as daemon
+# startup is one of the things to track.
+if is_service_enabled sysstat;then
+ if [[ -n ${SCREEN_LOGDIR} ]]; then
+ screen_it sysstat "sar -o $SCREEN_LOGDIR/$SYSSTAT_FILE $SYSSTAT_INTERVAL"
+ else
+ screen_it sysstat "sar $SYSSTAT_INTERVAL"
+ fi
+fi
+
# Keystone
# --------
@@ -1275,14 +1286,6 @@
screen_it baremetal "nova-baremetal-deploy-helper"
fi
-# run sysstat if it is enabled
-if is_service_enabled sysstat;then
- if [[ -n ${SCREEN_LOGDIR} ]]; then
- screen_it sysstat "sar -o $SCREEN_LOGDIR/$SYSSTAT_FILE $SYSSTAT_INTERVAL"
- else
- screen_it sysstat "sar $SYSSTAT_INTERVAL"
- fi
-fi
# Save some values we generated for later use
CURRENT_RUN_TIME=$(date "+$TIMESTAMP_FORMAT")