openstack/kolla-kubernetes
Code Issues Proposed changes

Fix gate after the repo split

Browse Source 
TrivialFix

Change-Id: I841cf9b54d8940cb22d59c45b28b344bd40e182b
This commit is contained in:
Kevin Fox 2016-11-17 06:58:44 -08:00
parent 453ff9d72b
commit ba52afea83
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/bin/setup_canal.sh
View File

@ -8,7 +8,7 @@ url="$url/k8s-install/kubeadm/canal.yaml"
curl "$url" -o /tmp/canal.yaml
sed -i "s@192.168.0.0/16@172.16.130.0/22@" /tmp/canal.yaml
sed -i "s@100.78.232.136@172.16.128.100@" /tmp/canal.yaml
sed -i "s@10.96.232.136@172.16.128.100@" /tmp/canal.yaml
kubectl create -f /tmp/canal.yaml

5
tools/setup_gate.sh
View File

@ -22,8 +22,9 @@ EOF
[ -x /usr/zuul-env/bin/zuul-cloner ] && \
/usr/zuul-env/bin/zuul-cloner -m /tmp/clonemap --workspace `pwd` \
--branch master --cache-dir /opt/git git://git.openstack.org \
openstack/kolla || \
git clone https://github.com/openstack/kolla.git
openstack/kolla-ansible && true
[ ! -d kolla-ansible ] && git clone https://github.com/openstack/kolla-ansible.git
mv kolla-ansible kolla
sudo ln -s `pwd`/kolla/etc/kolla /etc/kolla
sudo ln -s `pwd`/kolla /usr/share/kolla

2
tools/test.sh
View File

@ -1,5 +1,5 @@
#!/bin/bash
[ ! -d ../kolla ] && pushd .. && git clone https://github.com/openstack/kolla && popd
[ ! -d ../kolla ] && pushd .. && git clone https://github.com/openstack/kolla-ansible && mv kolla-ansible kolla && popd
grep api_interface_address ../kolla/etc/kolla/globals.yml || echo api_interface_address: "0.0.0.0" >> ../kolla/etc/kolla/globals.yml
grep tunnel_interface_address ../kolla/etc/kolla/globals.yml || echo tunnel_interface_address: "0.0.0.0" >> ../kolla/etc/kolla/globals.yml
grep orchestration_engine ../kolla/etc/kolla/globals.yml || echo orchestration_engine: KUBERNETES >> ../kolla/etc/kolla/globals.yml