summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xscripts/files/elements/fedora-mariadb/install.d/10-mariadb2
-rwxr-xr-xscripts/files/elements/fedora-mariadb/pre-install.d/10-percona-copr2
-rwxr-xr-xscripts/files/elements/fedora-mysql/install.d/40-xtrabackup2
-rwxr-xr-xscripts/files/elements/fedora-percona/install.d/10-mysql2
-rwxr-xr-xscripts/files/elements/ubuntu-mariadb/install.d/30-mariadb2
-rwxr-xr-xscripts/files/elements/ubuntu-mysql/install.d/30-mysql4
-rwxr-xr-xscripts/files/elements/ubuntu-percona/install.d/30-mysql2
-rwxr-xr-xscripts/files/elements/ubuntu-pxc/install.d/30-mysql2
-rw-r--r--scripts/local.conf.d/ceilometer_cinder.conf.rc3
-rw-r--r--scripts/local.conf.d/ceilometer_nova.conf.rc3
-rw-r--r--scripts/local.conf.d/ceilometer_services.conf.rc (renamed from scripts/local.conf.d/ceilometer.conf.rc)0
-rw-r--r--scripts/localrc.rc7
-rwxr-xr-xscripts/redstack14
-rw-r--r--scripts/redstack.rc11
14 files changed, 35 insertions, 21 deletions
diff --git a/scripts/files/elements/fedora-mariadb/install.d/10-mariadb b/scripts/files/elements/fedora-mariadb/install.d/10-mariadb
index a5cc2c0..cc78b0d 100755
--- a/scripts/files/elements/fedora-mariadb/install.d/10-mariadb
+++ b/scripts/files/elements/fedora-mariadb/install.d/10-mariadb
@@ -6,4 +6,4 @@
set -e
set -o xtrace
-dnf -y install mariadb-server percona-xtrabackup
+dnf -y install mariadb-server percona-xtrabackup-22
diff --git a/scripts/files/elements/fedora-mariadb/pre-install.d/10-percona-copr b/scripts/files/elements/fedora-mariadb/pre-install.d/10-percona-copr
index bcc5520..b219914 100755
--- a/scripts/files/elements/fedora-mariadb/pre-install.d/10-percona-copr
+++ b/scripts/files/elements/fedora-mariadb/pre-install.d/10-percona-copr
@@ -7,4 +7,4 @@ set -e
set -o xtrace
# install from Fedora repos
-dnf -y install percona-xtrabackup
+dnf -y install percona-xtrabackup-22
diff --git a/scripts/files/elements/fedora-mysql/install.d/40-xtrabackup b/scripts/files/elements/fedora-mysql/install.d/40-xtrabackup
index 9c9709c..ecf0847 100755
--- a/scripts/files/elements/fedora-mysql/install.d/40-xtrabackup
+++ b/scripts/files/elements/fedora-mysql/install.d/40-xtrabackup
@@ -6,5 +6,5 @@
set -e
set -o xtrace
-dnf -y install percona-xtrabackup
+dnf -y install percona-xtrabackup-22
diff --git a/scripts/files/elements/fedora-percona/install.d/10-mysql b/scripts/files/elements/fedora-percona/install.d/10-mysql
index 0f31d80..cf5b111 100755
--- a/scripts/files/elements/fedora-percona/install.d/10-mysql
+++ b/scripts/files/elements/fedora-percona/install.d/10-mysql
@@ -6,4 +6,4 @@
set -e
set -o xtrace
-dnf -y install percona-toolkit Percona-Server-shared-55 Percona-Server-server-55 Percona-Server-test-55 Percona-Server-client-55 percona-xtrabackup
+dnf -y install percona-toolkit Percona-Server-shared-55 Percona-Server-server-55 Percona-Server-test-55 Percona-Server-client-55 percona-xtrabackup-22
diff --git a/scripts/files/elements/ubuntu-mariadb/install.d/30-mariadb b/scripts/files/elements/ubuntu-mariadb/install.d/30-mariadb
index 47b9fbe..c811572 100755
--- a/scripts/files/elements/ubuntu-mariadb/install.d/30-mariadb
+++ b/scripts/files/elements/ubuntu-mariadb/install.d/30-mariadb
@@ -18,7 +18,7 @@ add-apt-repository 'deb http://ftp.osuosl.org/pub/mariadb/repo/5.5/ubuntu trusty
sudo echo -e "Package: *\nPin: origin ftp.osuosl.org\nPin-Priority: 1000" > /etc/apt/preferences.d/mariadb.pref
apt-get -y update
-apt-get -y install libmariadbclient18 mariadb-server percona-xtrabackup
+apt-get -y install libmariadbclient18 mariadb-server percona-xtrabackup-22
cat >/etc/mysql/conf.d/no_perf_schema.cnf <<_EOF_
[mysqld]
diff --git a/scripts/files/elements/ubuntu-mysql/install.d/30-mysql b/scripts/files/elements/ubuntu-mysql/install.d/30-mysql
index 266d428..bce5ef3 100755
--- a/scripts/files/elements/ubuntu-mysql/install.d/30-mysql
+++ b/scripts/files/elements/ubuntu-mysql/install.d/30-mysql
@@ -7,9 +7,9 @@ set -e
set -o xtrace
export DEBIAN_FRONTEND=noninteractive
-apt-get -y install libmysqlclient18 mysql-server-5.6 percona-xtrabackup
+apt-get -y install libmysqlclient18 mysql-server-5.6 percona-xtrabackup-22
cat >/etc/mysql/conf.d/no_perf_schema.cnf <<_EOF_
[mysqld]
performance_schema = off
-_EOF_ \ No newline at end of file
+_EOF_
diff --git a/scripts/files/elements/ubuntu-percona/install.d/30-mysql b/scripts/files/elements/ubuntu-percona/install.d/30-mysql
index a156023..1c8ab2e 100755
--- a/scripts/files/elements/ubuntu-percona/install.d/30-mysql
+++ b/scripts/files/elements/ubuntu-percona/install.d/30-mysql
@@ -7,4 +7,4 @@ set -e
set -o xtrace
export DEBIAN_FRONTEND=noninteractive
-apt-get -y install percona-toolkit percona-server-common-5.5 percona-server-server-5.5 percona-server-test-5.5 percona-server-client-5.5 percona-xtrabackup
+apt-get -y install percona-toolkit percona-server-common-5.5 percona-server-server-5.5 percona-server-test-5.5 percona-server-client-5.5 percona-xtrabackup-22
diff --git a/scripts/files/elements/ubuntu-pxc/install.d/30-mysql b/scripts/files/elements/ubuntu-pxc/install.d/30-mysql
index f1b8aa9..30f02a3 100755
--- a/scripts/files/elements/ubuntu-pxc/install.d/30-mysql
+++ b/scripts/files/elements/ubuntu-pxc/install.d/30-mysql
@@ -7,7 +7,7 @@ set -e
set -o xtrace
export DEBIAN_FRONTEND=noninteractive
-apt-get -y install percona-xtradb-cluster-server percona-xtrabackup
+apt-get -y install percona-xtradb-cluster-server percona-xtrabackup-22
# Don't auto start mysql (we'll start it up in guest)
update-rc.d mysql defaults
diff --git a/scripts/local.conf.d/ceilometer_cinder.conf.rc b/scripts/local.conf.d/ceilometer_cinder.conf.rc
new file mode 100644
index 0000000..9b80b6c
--- /dev/null
+++ b/scripts/local.conf.d/ceilometer_cinder.conf.rc
@@ -0,0 +1,3 @@
+[[post-config|\$CINDER_CONF]]
+[DEFAULT]
+notification_driver = messagingv2
diff --git a/scripts/local.conf.d/ceilometer_nova.conf.rc b/scripts/local.conf.d/ceilometer_nova.conf.rc
new file mode 100644
index 0000000..fe48b02
--- /dev/null
+++ b/scripts/local.conf.d/ceilometer_nova.conf.rc
@@ -0,0 +1,3 @@
+[[post-config|\$NOVA_CONF]]
+[DEFAULT]
+instance_usage_audit = True
diff --git a/scripts/local.conf.d/ceilometer.conf.rc b/scripts/local.conf.d/ceilometer_services.conf.rc
index ce33948..ce33948 100644
--- a/scripts/local.conf.d/ceilometer.conf.rc
+++ b/scripts/local.conf.d/ceilometer_services.conf.rc
diff --git a/scripts/localrc.rc b/scripts/localrc.rc
index 09df40d..30ee636 100644
--- a/scripts/localrc.rc
+++ b/scripts/localrc.rc
@@ -11,7 +11,7 @@ TROVE_AUTH_CACHE_DIR=$TROVE_AUTH_CACHE_DIR
# Enable the Trove plugin for devstack
if [[ $USE_DEVSTACK_TROVE_PLUGIN = true ]]; then
- enable_plugin trove $TROVE_REPO $TROVE_DIR $TROVE_BRANCH
+ enable_plugin trove $TROVE_REPO $TROVE_BRANCH
fi
# Enable Trove, Swift, and Heat
@@ -27,10 +27,7 @@ fi
if [[ $ENABLE_CEILOMETER = true ]] || [[ $ENABLE_PROFILER = true ]]; then
CEILOMETER_BACKEND=mysql
CEILOMETER_NOTIFICATION_TOPICS=notifications,profiler
- ENABLED_SERVICES+=,ceilometer-acompute,ceilometer-acentral
- ENABLED_SERVICES+=,ceilometer-anotification,ceilometer-collector
- ENABLED_SERVICES+=,ceilometer-alarm-evaluator,ceilometer-alarm-notifier
- ENABLED_SERVICES+=,ceilometer-api
+ enable_plugin ceilometer ${GIT_OPENSTACK}/ceilometer.git
fi
# Use Git repositories for client components
diff --git a/scripts/redstack b/scripts/redstack
index 69685b7..e58ba7e 100755
--- a/scripts/redstack
+++ b/scripts/redstack
@@ -744,6 +744,9 @@ function cmd_build_image() {
sudo $HTTP_PROXY $PKG_MGR $PKG_GET_ARGS update
sudo $HTTP_PROXY $PKG_MGR $PKG_GET_ARGS install qemu
sudo -H $HTTP_PROXY pip install --upgrade pip dib-utils
+
+ install_devstack_code
+
cmd_clone_projects do_not_force_update $REDSTACK_SCRIPTS/image-projects-list
exclaim "Use tripleo-diskimagebuilder to actually build the Trove Guest Agent Image."
@@ -1085,10 +1088,13 @@ function cmd_dsvm_gate_tests() {
NETWORK_GATEWAY=${4:-'10.1.0.1'}
ESCAPED_PATH_TROVE=${5:-'\/opt\/stack\/new\/trove'}
- # Ensure we have access to the clouds.yaml file set up by devstack-gate
- sudo mkdir -p ~/.config/openstack
- sudo ln -s $DEST/.config/openstack/clouds.yaml ~/.config/openstack/clouds.yaml
- sudo chown -R $(whoami) ~/.config
+ if [[ $BRANCH_OVERRIDE == "stable/liberty" || $BRANCH_OVERRIDE == "stable/liberty" ]]; then
+ # Devstack in liberty doesn't copy the clouds.yaml file to /etc so we need to
+ # ensure we have access to the clouds.yaml file set up by devstack-gate
+ sudo mkdir -p ~/.config/openstack
+ sudo ln -s $DEST/.config/openstack/clouds.yaml ~/.config/openstack/clouds.yaml
+ sudo chown -R $(whoami) ~/.config
+ fi
# Devstack vm-gate runs as the jenkins user, but needs to connect to the guest image as ubuntu
echo "User=ubuntu" >> /home/jenkins/.ssh/config
diff --git a/scripts/redstack.rc b/scripts/redstack.rc
index 440547a..2fbf12f 100644
--- a/scripts/redstack.rc
+++ b/scripts/redstack.rc
@@ -9,14 +9,14 @@
# Enable neutron instead of nova-network
ENABLE_NEUTRON=$(get_bool ENABLE_NEUTRON false)
-# Enable ceilometer
-ENABLE_CEILOMETER=$(get_bool ENABLE_CEILOMETER false)
-
# Enable osprofiler - note: Enables Ceilometer as well
ENABLE_PROFILER=$(get_bool ENABLE_PROFILER false)
PROFILER_TRACE_SQL=$(get_bool PROFILER_TRACE_SQL false)
[ -z $PROFILER_HMAC_KEYS ] && PROFILER_HMAC_KEYS=SECRET_KEY
+# Enable ceilometer
+ENABLE_CEILOMETER=$(get_bool ENABLE_CEILOMETER $ENABLE_PROFILER)
+
# Enable LIBS_FROM_GIT
LIBS_FROM_GIT_ALL_CLIENTS=$(get_bool LIBS_FROM_GIT_ALL_CLIENTS false)
LIBS_FROM_GIT_ALL_OSLO=$(get_bool LIBS_FROM_GIT_ALL_OSLO false)
@@ -25,6 +25,11 @@ LIBS_FROM_GIT_ALL_OSLO=$(get_bool LIBS_FROM_GIT_ALL_OSLO false)
USING_VAGRANT=$(get_bool USING_VAGRANT false)
USE_UUID_TOKEN=$(get_bool USE_UUID_TOKEN false)
+# Specify configuration for Ceilometer
+CEILOMETER_SERVICES_CONF=$(get_bool CEILOMETER_SERVICES_CONF $ENABLE_CEILOMETER)
+CEILOMETER_CINDER_CONF=$(get_bool CEILOMETER_CINDER_CONF false)
+CEILOMETER_NOVA_CONF=$(get_bool CEILOMETER_NOVA_CONF false)
+
# Paths for various OpenStack components
PATH_DEVSTACK_OUTPUT=$DEST
PATH_NOVA=$DEST/nova
View Lorry Controller Status