From f21c175b6aaaa6410dcc4e34ad11a06124716258 Mon Sep 17 00:00:00 2001 From: Hongbin Lu Date: Sun, 12 Feb 2017 23:07:19 -0600 Subject: [PATCH] Copy gate_hook.sh to the tests/contrib folder By convention, gate_hook.sh should be placed under tests/contrib folder, not under /devstack folder. This is the first step to move this file Change-Id: I70e20f86ca584e8ce88b616e611d17b4f245c525 --- zun/tests/contrib/gate_hook.sh | 37 ++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100755 zun/tests/contrib/gate_hook.sh diff --git a/zun/tests/contrib/gate_hook.sh b/zun/tests/contrib/gate_hook.sh new file mode 100755 index 000000000..5023435ca --- /dev/null +++ b/zun/tests/contrib/gate_hook.sh @@ -0,0 +1,37 @@ +#!/bin/bash -x +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +# This script is executed inside gate_hook function in devstack gate. + + +# Keep all devstack settings here instead of project-config for easy +# maintain if we want to change devstack config settings in future. + +driver=$1 +db=$2 + +if [ "$driver" = "docker" ]; then + export DEVSTACK_LOCAL_CONFIG+=$'\n'"ZUN_DRIVER=docker" +elif [ "$driver" = "nova-docker" ]; then + export DEVSTACK_LOCAL_CONFIG+=$'\n'"ZUN_DRIVER=nova-docker" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"IP_VERSION=4" +fi + +if [ "$db" = "etcd" ]; then + export DEVSTACK_LOCAL_CONFIG+=$'\n'"ZUN_DB_TYPE=etcd" +elif [ "$db" = "sql" ]; then + export DEVSTACK_LOCAL_CONFIG+=$'\n'"ZUN_DB_TYPE=sql" +fi + +$BASE/new/devstack-gate/devstack-vm-gate.sh