diff options
| author | Zuul <zuul@review.opendev.org> | 2019-10-11 08:35:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-10-11 08:35:18 +0000 |
| commit | bdd44790fb10b20a7ef4ceed161bb2ca0e4f5c48 (patch) | |
| tree | f2c4e07d46580843fde07fee0881bef833124451 | |
| parent | cec606a2e45f941f744a8c120afa9da02fd4de94 (diff) | |
| parent | fc0c4fff4cd56a2dc88d083454c75ac2079f3fc8 (diff) | |
| download | trove-bdd44790fb10b20a7ef4ceed161bb2ca0e4f5c48.tar.gz | |
Merge "Rename devstack variable TROVE_DISABLE_IMAGE_SETUP"
| -rw-r--r-- | .zuul.yaml | 32 | ||||
| -rw-r--r-- | devstack/plugin.sh | 4 | ||||
| -rw-r--r-- | devstack/settings | 4 | ||||
| -rw-r--r-- | doc/source/install/install-devstack.rst | 3 |
4 files changed, 20 insertions, 23 deletions
@@ -164,7 +164,7 @@ trove_test_datastore: cassandra trove_test_group: cassandra-supported-single devstack_localrc: - TROVE_DISABLE_IMAGE_SETUP: true + TROVE_ENABLE_IMAGE_BUILD: false - job: name: trove-scenario-cassandra-multi @@ -173,7 +173,7 @@ trove_test_datastore: cassandra trove_test_group: cassandra-supported-multi devstack_localrc: - TROVE_DISABLE_IMAGE_SETUP: true + TROVE_ENABLE_IMAGE_BUILD: false - job: name: trove-scenario-couchdb-single @@ -182,7 +182,7 @@ trove_test_datastore: couchdb trove_test_group: couchdb-supported-single devstack_localrc: - TROVE_DISABLE_IMAGE_SETUP: true + TROVE_ENABLE_IMAGE_BUILD: false - job: name: trove-scenario-couchbase-single @@ -191,7 +191,7 @@ trove_test_datastore: couchbase trove_test_group: couchbase-supported-single devstack_localrc: - TROVE_DISABLE_IMAGE_SETUP: true + TROVE_ENABLE_IMAGE_BUILD: false - job: name: trove-scenario-mariadb-single @@ -200,7 +200,7 @@ trove_test_datastore: mariadb trove_test_group: mariadb-supported-single devstack_localrc: - TROVE_DISABLE_IMAGE_SETUP: true + TROVE_ENABLE_IMAGE_BUILD: false - job: name: trove-scenario-mariadb-multi @@ -209,7 +209,7 @@ trove_test_datastore: mariadb trove_test_group: mariadb-supported-multi devstack_localrc: - TROVE_DISABLE_IMAGE_SETUP: true + TROVE_ENABLE_IMAGE_BUILD: false - job: name: trove-scenario-mongodb-single @@ -218,7 +218,7 @@ trove_test_datastore: mongodb trove_test_group: mongodb-supported-single devstack_localrc: - TROVE_DISABLE_IMAGE_SETUP: true + TROVE_ENABLE_IMAGE_BUILD: false - job: name: trove-scenario-mongodb-multi @@ -227,7 +227,7 @@ trove_test_datastore: mongodb trove_test_group: mongodb-supported-multi devstack_localrc: - TROVE_DISABLE_IMAGE_SETUP: true + TROVE_ENABLE_IMAGE_BUILD: false - job: name: trove-scenario-mysql-single @@ -250,7 +250,7 @@ trove_test_datastore: percona trove_test_group: percona-supported-multi devstack_localrc: - TROVE_DISABLE_IMAGE_SETUP: true + TROVE_ENABLE_IMAGE_BUILD: false - job: name: trove-scenario-percona-single @@ -259,7 +259,7 @@ trove_test_datastore: percona trove_test_group: percona-supported-single devstack_localrc: - TROVE_DISABLE_IMAGE_SETUP: true + TROVE_ENABLE_IMAGE_BUILD: false - job: name: trove-scenario-postgresql-single @@ -268,7 +268,7 @@ trove_test_datastore: postgresql trove_test_group: postgresql-supported-single devstack_localrc: - TROVE_DISABLE_IMAGE_SETUP: true + TROVE_ENABLE_IMAGE_BUILD: false - job: name: trove-scenario-postgresql-multi @@ -277,7 +277,7 @@ trove_test_datastore: postgresql trove_test_group: postgresql-supported-multi devstack_localrc: - TROVE_DISABLE_IMAGE_SETUP: true + TROVE_ENABLE_IMAGE_BUILD: false - job: name: trove-scenario-pxc-single @@ -286,7 +286,7 @@ trove_test_datastore: pxc trove_test_group: pxc-supported-single devstack_localrc: - TROVE_DISABLE_IMAGE_SETUP: true + TROVE_ENABLE_IMAGE_BUILD: false - job: name: trove-scenario-pxc-multi @@ -295,7 +295,7 @@ trove_test_datastore: pxc trove_test_group: pxc-supported-multi devstack_localrc: - TROVE_DISABLE_IMAGE_SETUP: true + TROVE_ENABLE_IMAGE_BUILD: false - job: name: trove-scenario-redis-single @@ -304,7 +304,7 @@ trove_test_datastore: redis trove_test_group: redis-supported-single devstack_localrc: - TROVE_DISABLE_IMAGE_SETUP: true + TROVE_ENABLE_IMAGE_BUILD: false - job: name: trove-scenario-redis-multi @@ -313,7 +313,7 @@ trove_test_datastore: redis trove_test_group: redis-supported-multi devstack_localrc: - TROVE_DISABLE_IMAGE_SETUP: true + TROVE_ENABLE_IMAGE_BUILD: false - job: name: trove-tox-fakemodetests diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 237d15b8..0b4e9041 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -436,8 +436,8 @@ function configure_tempest_for_trove { # Use trovestack to create guest image and register the image in the datastore. function create_guest_image { - TROVE_DISABLE_IMAGE_SETUP=`echo ${TROVE_DISABLE_IMAGE_SETUP,,}` - if [[ ${TROVE_DISABLE_IMAGE_SETUP} == "true" ]]; then + TROVE_ENABLE_IMAGE_BUILD=`echo ${TROVE_ENABLE_IMAGE_BUILD,,}` + if [[ ${TROVE_ENABLE_IMAGE_BUILD} == "false" ]]; then echo "Skip creating guest image." return 0 fi diff --git a/devstack/settings b/devstack/settings index 7ad3bb83..15623836 100644 --- a/devstack/settings +++ b/devstack/settings @@ -86,5 +86,5 @@ enable_service trove tr-api tr-tmgr tr-cond # Nova to use a single MQ for the computes to talk to the scheduler. CELLSV2_SETUP=singleconductor -# Trove image configuration, by default we don't build image. -TROVE_DISABLE_IMAGE_SETUP=${TROVE_DISABLE_IMAGE_SETUP:-"true"} +# Enable or disable the Trove guest image build during devstack installation. +TROVE_ENABLE_IMAGE_BUILD=${TROVE_ENABLE_IMAGE_BUILD:-"true"} diff --git a/doc/source/install/install-devstack.rst b/doc/source/install/install-devstack.rst index 6f54fa62..a5257137 100644 --- a/doc/source/install/install-devstack.rst +++ b/doc/source/install/install-devstack.rst @@ -107,9 +107,6 @@ configuration, change the ``HOST_IP`` to your own devstack host IP address: SWIFT_HASH=66a3d6b56c1f479c8b4e70ab5c2000f5 SWIFT_REPLICAS=1 - # Trove - TROVE_DISABLE_IMAGE_SETUP=False - Take a look at the `options <https://opendev.org/openstack/trove/src/branch/master/devstack/settings>`_ you could use to customize the Trove installation. |