openstack
/
tripleo-ci
Code Issues Proposed changes

Merge "Revert "Switch away from the default IP range used by tripleo""

This commit is contained in:
Jenkins 2016-07-12 19:30:25 +00:00 committed by Gerrit Code Review
parent ce4e816c92 decc80b4a6
commit 0c46a1e095
4 changed files with 3 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
scripts/deploy.sh
View File

@ -16,31 +16,6 @@ export STABLE_RELEASE=${STABLE_RELEASE:-""}
echo '[DEFAULT]' > ~/undercloud.conf
# Switch away from the default IP range used by tripleo, for 2 reasons
# 1. To make it less likley any traffic that leaks from one tenant network to
# another will effect currently running jobs (We suspect this is occurring).
# 2. To eliminate any assumptions that creep into tripleo about the IP
# range used.
echo "local_ip = 192.0.${RANDOM_IPRANGE_OCTET}.1/24" >> ~/undercloud.conf
echo "network_gateway = 192.0.${RANDOM_IPRANGE_OCTET}.1" >> ~/undercloud.conf
echo "undercloud_public_vip = 192.0.${RANDOM_IPRANGE_OCTET}.2" >> ~/undercloud.conf
echo "undercloud_admin_vip = 192.0.${RANDOM_IPRANGE_OCTET}.3" >> ~/undercloud.conf
echo "network_cidr = 192.0.${RANDOM_IPRANGE_OCTET}.0/24" >> ~/undercloud.conf
echo "masquerade_network = 192.0.${RANDOM_IPRANGE_OCTET}.0/24" >> ~/undercloud.conf
echo "dhcp_start = 192.0.${RANDOM_IPRANGE_OCTET}.5" >> ~/undercloud.conf
echo "dhcp_end = 192.0.${RANDOM_IPRANGE_OCTET}.24" >> ~/undercloud.conf
echo "inspection_iprange = 192.0.${RANDOM_IPRANGE_OCTET}.100,192.0.${RANDOM_IPRANGE_OCTET}.120" >> ~/undercloud.conf
export FLOATING_IP_CIDR=192.0.${RANDOM_IPRANGE_OCTET}.0/24
export FLOATING_IP_START=192.0.${RANDOM_IPRANGE_OCTET}.50
export FLOATING_IP_END=192.0.${RANDOM_IPRANGE_OCTET}.64
export EXTERNAL_NETWORK_GATEWAY=192.0.${RANDOM_IPRANGE_OCTET}.1
export FLOATING_IP_CIDR=192.0.${RANDOM_IPRANGE_OCTET}.0/24
export FLOATING_IP_START=192.0.${RANDOM_IPRANGE_OCTET}.50
export FLOATING_IP_END=192.0.${RANDOM_IPRANGE_OCTET}.64
if [ $UNDERCLOUD_SSL == 1 ] ; then
echo 'generate_service_certificate = True' >> ~/undercloud.conf
fi

4
toci_gate_test.sh
View File

@ -11,10 +11,6 @@ fi
# Clean any cached yum metadata, it maybe stale
sudo yum clean all
# Generate a random OCTET of the IP range used in THIS ci job
# See scripts/deploy.sh for more detail
export RANDOM_IPRANGE_OCTET=$(( $RANDOM%254+1 ))
# NOTE(pabelanger): Current hack to make centos-7 dib work.
# TODO(pabelanger): Why is python-requests installed from pip?
sudo rm -rf /usr/lib/python2.7/site-packages/requests

2
toci_instack.sh
View File

@ -26,7 +26,7 @@ mkdir -p $WORKSPACE/logs
MY_IP=$(ip addr show dev eth1 | awk '/inet / {gsub("/.*", "") ; print $2}')
export no_proxy=192.0.${RANDOM_IPRANGE_OCTET}.1,$MY_IP,$MIRRORSERVER
export no_proxy=192.0.2.1,$MY_IP,$MIRRORSERVER
# Setup delorean
$TRIPLEO_ROOT/tripleo-ci/scripts/tripleo.sh --delorean-setup

3
toci_instack_ovb.sh
View File

@ -28,6 +28,7 @@ sudo netstat -lpn | grep tcp | grep :8088 | awk '{print $7}' | cut -d / -f 1 | h
# TODO: xfsprogs should be a dep of DIB?
sudo yum install -y xfsprogs qemu-img
# Setting up localhost so that postci will ssh to it to retrieve logs
# once the legacy TE support is removed from tripleo-ci we won't need to do
# this any longer
@ -42,7 +43,7 @@ cat ~/.ssh/id_rsa.pub | sudo tee -a ~root/.ssh/authorized_keys | sudo tee -a ~/.
sudo yum remove -y puppet hiera puppetlabs-release rdo-release
sudo rm -rf /etc/puppet /etc/hiera.yaml
export no_proxy=192.0.${RANDOM_IPRANGE_OCTET}.1,$MY_IP,$MIRRORSERVER
export no_proxy=192.0.2.1,$MY_IP,$MIRRORSERVER
# Setup delorean
$TRIPLEO_ROOT/tripleo-ci/scripts/tripleo.sh --delorean-setup