summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-01-09 16:12:08 +0000
committerGerrit Code Review <review@openstack.org>2019-01-09 16:12:08 +0000
commitaf1e03d32f4ce4f2d4cf41ae1c87b96a3d7505f0 (patch)
tree26dab3f18f55c1dae47f5ad3b8761e9edcb505aa
parent9deb322962605bb1fad11a25ea30c6af5d73a385 (diff)
parent75f46dbdb1d70b4dc17be236644e8ded659c05ad (diff)
Merge "Add a tempest cloud provider option"
-rw-r--r--.zuul.d/base.yaml1
-rw-r--r--devstack/plugin.sh3
2 files changed, 4 insertions, 0 deletions
diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml
index 4b79c48..cf631c9 100644
--- a/.zuul.d/base.yaml
+++ b/.zuul.d/base.yaml
@@ -37,6 +37,7 @@
37 KURYR_K8S_API_PORT: 8080 37 KURYR_K8S_API_PORT: 8080
38 TEMPEST_PLUGINS: '/opt/stack/kuryr-tempest-plugin' 38 TEMPEST_PLUGINS: '/opt/stack/kuryr-tempest-plugin'
39 Q_BUILD_OVS_FROM_GIT: true 39 Q_BUILD_OVS_FROM_GIT: true
40 KURYR_K8S_CLOUD_PROVIDER: false
40 devstack_services: 41 devstack_services:
41 # TODO(dmellado):Temporary workaround until proper fix 42 # TODO(dmellado):Temporary workaround until proper fix
42 base: false 43 base: false
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 38f5cb2..cad8cb5 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -906,6 +906,9 @@ function update_tempest_conf_file {
906 if [[ "$KURYR_K8S_MULTI_WORKER_TESTS" == "True" ]]; then 906 if [[ "$KURYR_K8S_MULTI_WORKER_TESTS" == "True" ]]; then
907 iniset $TEMPEST_CONFIG kuryr_kubernetes multi_worker_setup True 907 iniset $TEMPEST_CONFIG kuryr_kubernetes multi_worker_setup True
908 fi 908 fi
909 if [[ "$KURYR_K8S_CLOUD_PROVIDER" == "True" ]]; then
910 iniset $TEMPEST_CONFIG kuryr_kubernetes cloud_provider True
911 fi
909} 912}
910 913
911source $DEST/kuryr-kubernetes/devstack/lib/kuryr_kubernetes 914source $DEST/kuryr-kubernetes/devstack/lib/kuryr_kubernetes