Merge "Install bc with all distribution"
diff --git a/extras.d/70-trove b/extras.d/70-trove
new file mode 100644
index 0000000..a4dc7fb
--- /dev/null
+++ b/extras.d/70-trove
@@ -0,0 +1,33 @@
+# trove.sh - Devstack extras script to install Trove
+
+if is_service_enabled trove; then
+ if [[ "$1" == "source" ]]; then
+ # Initial source
+ source $TOP_DIR/lib/trove
+ elif [[ "$1" == "stack" && "$2" == "install" ]]; then
+ echo_summary "Installing Trove"
+ install_trove
+ install_troveclient
+ cleanup_trove
+ elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
+ echo_summary "Configuring Trove"
+ configure_troveclient
+ configure_trove
+
+ if is_service_enabled key; then
+ create_trove_accounts
+ fi
+
+ elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
+ # Initialize trove
+ init_trove
+
+ # Start the trove API and trove taskmgr components
+ echo_summary "Starting Trove"
+ start_trove
+ fi
+
+ if [[ "$1" == "unstack" ]]; then
+ stop_trove
+ fi
+fi
diff --git a/lib/heat b/lib/heat
index 0307c64..b9b8aa6 100644
--- a/lib/heat
+++ b/lib/heat
@@ -60,13 +60,13 @@
# remove old config files
rm -f $HEAT_CONF_DIR/heat-*.conf
- HEAT_API_CFN_HOST=${HEAT_API_CFN_HOST:-$SERVICE_HOST}
+ HEAT_API_CFN_HOST=${HEAT_API_CFN_HOST:-$HOST_IP}
HEAT_API_CFN_PORT=${HEAT_API_CFN_PORT:-8000}
HEAT_ENGINE_HOST=${HEAT_ENGINE_HOST:-$SERVICE_HOST}
HEAT_ENGINE_PORT=${HEAT_ENGINE_PORT:-8001}
- HEAT_API_CW_HOST=${HEAT_API_CW_HOST:-$SERVICE_HOST}
+ HEAT_API_CW_HOST=${HEAT_API_CW_HOST:-$HOST_IP}
HEAT_API_CW_PORT=${HEAT_API_CW_PORT:-8003}
- HEAT_API_HOST=${HEAT_API_HOST:-$SERVICE_HOST}
+ HEAT_API_HOST=${HEAT_API_HOST:-$HOST_IP}
HEAT_API_PORT=${HEAT_API_PORT:-8004}
HEAT_API_PASTE_FILE=$HEAT_CONF_DIR/api-paste.ini
HEAT_POLICY_FILE=$HEAT_CONF_DIR/policy.json
diff --git a/lib/nova b/lib/nova
index b85f094..dbaa3f5 100644
--- a/lib/nova
+++ b/lib/nova
@@ -652,8 +652,12 @@
local log_filters="1:libvirt 1:qemu 1:conf 1:security 3:event 3:json 3:file 1:util"
local log_outputs="1:file:/var/log/libvirt/libvirtd.log"
# Enable server side traces for libvirtd
- echo "log_filters=\"$log_filters\"" | sudo tee -a /etc/libvirt/libvirtd.conf
- echo "log_outputs=\"$log_outputs\"" | sudo tee -a /etc/libvirt/libvirtd.conf
+ if ! grep -q "log_filters=\"$log_filters\"" /etc/libvirt/libvirtd.conf; then
+ echo "log_filters=\"$log_filters\"" | sudo tee -a /etc/libvirt/libvirtd.conf
+ fi
+ if ! grep -q "log_outputs=\"$log_outputs\"" /etc/libvirt/libvirtd.conf; then
+ echo "log_outputs=\"$log_outputs\"" | sudo tee -a /etc/libvirt/libvirtd.conf
+ fi
# The group **$LIBVIRT_GROUP** is added to the current user in this script.
# Use 'sg' to execute nova-compute as a member of the **$LIBVIRT_GROUP** group.
diff --git a/lib/swift b/lib/swift
index 44c230b..37b630c 100644
--- a/lib/swift
+++ b/lib/swift
@@ -652,8 +652,10 @@
if type -p swift-init >/dev/null; then
swift-init --run-dir=${SWIFT_DATA_DIR}/run all stop || true
fi
- # Dump the proxy server
- sudo pkill -f swift-proxy-server
+ for type in proxy object container account; do
+ # Dump all of the servers
+ pkill -f swift-
+ done
}
# Restore xtrace
diff --git a/lib/trove b/lib/trove
index 8e817f5..9c91024 100644
--- a/lib/trove
+++ b/lib/trove
@@ -38,6 +38,16 @@
TROVE_BIN_DIR=$(get_python_exec_prefix)
fi
+# Functions
+# ---------
+
+# Test if any Trove services are enabled
+# is_trove_enabled
+function is_trove_enabled {
+ [[ ,${ENABLED_SERVICES} =~ ,"tr-" ]] && return 0
+ return 1
+}
+
# setup_trove_logging() - Adds logging configuration to conf files
function setup_trove_logging() {
local CONF=$1
diff --git a/stack.sh b/stack.sh
index a2469f1..45d47c8 100755
--- a/stack.sh
+++ b/stack.sh
@@ -3,7 +3,7 @@
# ``stack.sh`` is an opinionated OpenStack developer installation. It
# installs and configures various combinations of **Ceilometer**, **Cinder**,
# **Glance**, **Heat**, **Horizon**, **Keystone**, **Nova**, **Neutron**,
-# **Swift**, and **Trove**
+# and **Swift**
# This script allows you to specify configuration options of what git
# repositories to use, enabled services, network configuration and various
@@ -337,7 +337,6 @@
source $TOP_DIR/lib/baremetal
source $TOP_DIR/lib/ldap
source $TOP_DIR/lib/ironic
-source $TOP_DIR/lib/trove
# Extras Source
# --------------
@@ -739,12 +738,6 @@
configure_heat
fi
-if is_service_enabled trove; then
- install_trove
- install_troveclient
- cleanup_trove
-fi
-
if is_service_enabled tls-proxy; then
configure_CA
init_CA
@@ -927,10 +920,6 @@
create_cinder_accounts
create_neutron_accounts
- if is_service_enabled trove; then
- create_trove_accounts
- fi
-
if is_service_enabled ceilometer; then
create_ceilometer_accounts
fi
@@ -1204,19 +1193,6 @@
start_heat
fi
-# Configure and launch the trove service api, and taskmanager
-if is_service_enabled trove; then
- # Initialize trove
- echo_summary "Configuring Trove"
- configure_troveclient
- configure_trove
- init_trove
-
- # Start the trove API and trove taskmgr components
- echo_summary "Starting Trove"
- start_trove
-fi
-
# Create account rc files
# =======================
diff --git a/tools/fixup_stuff.sh b/tools/fixup_stuff.sh
index 5fb47dc..a28e10e 100755
--- a/tools/fixup_stuff.sh
+++ b/tools/fixup_stuff.sh
@@ -69,6 +69,22 @@
sudo chmod +r $dir/*
fi
+# Ubuntu 12.04
+# -----
+# We can regularly get kernel crashes on the 12.04 default kernel, so attempt
+# to install a new kernel
+if [[ ${DISTRO} =~ (precise) ]]; then
+ # Finally, because we suspect the Precise kernel is problematic, install a new kernel
+ UPGRADE_KERNEL=$(trueorfalse False $UPGRADE_KERNEL)
+ if [[ $UPGRADE_KERNEL == "True" ]]; then
+ if [[ ! `uname -r` =~ (^3\.11) ]]; then
+ apt_get install linux-generic-lts-saucy
+ echo "Installing Saucy LTS kernel, please reboot before proceeding"
+ exit 1
+ fi
+ fi
+fi
+
# RHEL6
# -----
diff --git a/unstack.sh b/unstack.sh
index 31f6f01..92d0642 100755
--- a/unstack.sh
+++ b/unstack.sh
@@ -56,7 +56,6 @@
source $TOP_DIR/lib/baremetal
source $TOP_DIR/lib/ldap
source $TOP_DIR/lib/ironic
-source $TOP_DIR/lib/trove
# Extras Source
# --------------
@@ -92,9 +91,6 @@
fi
# Call service stop
-if is_service_enabled trove; then
- stop_trove
-fi
if is_service_enabled heat; then
stop_heat