openstack/kolla-kubernetes
Code Issues Proposed changes

Support 3.0.2 in the gate

Browse Source 
This PS adds support to the gate for 3.0.2.

Change-Id: Ia327dfb99aa5e7f5318b1457c1fd32d2a6058cb1
This commit is contained in:
Kevin Fox 2017-01-13 07:00:53 -08:00 committed by Michal (inc0) Jastrzebski
parent 23193ebd7e
commit 2a237329bc
6 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
helm/microservice/nova-libvirt-daemonset/templates/nova_libvirt.yaml
View File

@ -1,4 +1,4 @@
{{- $searchPath := ":global.kolla.nova.libvirt.deployment:global.kolla.nova.libvirt.all:global.kolla.nova.compute.all:global.kolla.nova.all:global.kolla.all" }}
{{- $searchPath := ":global.kolla.nova.libvirt.daemonset:global.kolla.nova.libvirt.all:global.kolla.nova.compute.all:global.kolla.nova.all:global.kolla.all" }}
{{- $resourceName := "nova-libvirt" }}
{{- $netHostTrue := true }}
{{- $podTypeBootstrap := false }}

1
tests/bin/gate_capture_logs.sh
View File

@ -97,4 +97,5 @@ cp /usr/bin/rbd $WORKSPACE/logs/rbd.sh
ssh $line ps ax > $WORKSPACE/logs/ps-$line.txt
done
ovs-vsctl show > $WORKSPACE/logs/ovs.txt
arp -a > $WORKSPACE/logs/arp.txt
exit -1

1
tests/bin/setup_config.sh
View File

@ -35,6 +35,7 @@ kolla-ansible/tools/generate_passwords.py
kolla-ansible/tools/kolla-ansible genconfig
crudini --set /etc/kolla/nova-compute/nova.conf libvirt virt_type qemu
crudini --set /etc/kolla/nova-compute/nova.conf libvirt cpu_mode none
crudini --set /etc/kolla/nova-compute/nova.conf libvirt rbd_user nova
UUID=$(awk '{if($1 == "rbd_secret_uuid:"){print $2}}' /etc/kolla/passwords.yml)
crudini --set /etc/kolla/nova-compute/nova.conf libvirt rbd_secret_uuid $UUID

1
tests/bin/setup_config_iscsi.sh
View File

@ -21,6 +21,7 @@ kolla-ansible/tools/generate_passwords.py
kolla-ansible/tools/kolla-ansible genconfig
crudini --set /etc/kolla/nova-compute/nova.conf libvirt virt_type qemu
crudini --set /etc/kolla/nova-compute/nova.conf libvirt cpu_mode none
# Keystone does not seem to invalidate its cache on entry point addition.
crudini --set /etc/kolla/keystone/keystone.conf cache enabled False

12
tools/setup_gate.sh
View File

@ -1,10 +1,16 @@
#!/bin/bash -xe
PACKAGE_VERSION=0.4.0-1
BRANCH="$6"
BRANCH="$7"
if [ "x$BRANCH" != "x2" ]; then
if [ "x$BRANCH" == "xt" ]; then
echo Version: $BRANCH is not enabled yet.
exit 0
fi
if [ "x$BRANCH" == "x3" ]; then
sed -i 's/2\.0\.2/3.0.2/g' helm/all_values.yaml
sed -i 's/2\.0\.2/3.0.2/g' tests/conf/ceph-all-in-one/kolla_config
fi
if [ "x$4" == "xiscsi" ]; then
@ -189,7 +195,7 @@ kubectl exec ceph-admin -c main --namespace=kolla -- /bin/bash \
-c "ceph osd pool delete rbd rbd --yes-i-really-really-mean-it"
tools/setup_simple_ceph_users.sh
tools/setup_rbd_volumes.sh --yes-i-really-really-mean-it
tools/setup_rbd_volumes.sh --yes-i-really-really-mean-it "$BRANCH"
if [ "x$4" == "xhelm-entrypoint" ]; then
tests/bin/ceph_workflow_service.sh "$4" "$2" "$BRANCH"

7
tools/setup_rbd_volumes.sh
View File

@ -6,9 +6,10 @@ if [ "x$1" != "x--yes-i-really-really-mean-it" ]; then
exit -1
fi
#FIXME This seems to be needed for 3.0.2
#RBD_ARGS="--image-feature layering"
RBD_ARGS=""
RBD_ARGS="--image-feature layering"
if [ "x$2" == "x2" ]; then
RBD_ARGS=""
fi
#FIXME may need different flags for testing jewel
str="timeout 240s rbd create kollavolumes/mariadb $RBD_ARGS --size 1024"