openstack
/
tripleo-ci
Code Issues Proposed changes

Configure a different port for httpd ipxe 

The default port for httpd ipxe in CI is 8088, which conflicts with
the port used for the telnet server that streams the job console log.
Configure the undercloud to use a different port (3816) instead to
avoid the conflict. When a different port is configured, we no longer
have to kill the telnet server.

Change-Id: Iaa67444ff4d65f628a5ab1b384d2f246669ceaa5
This commit is contained in:
James Slagle 2016-07-11 08:18:08 -04:00
parent 0c46a1e095
commit 2c92577472
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/deploy.sh
View File

@ -14,7 +14,13 @@ export DIB_DISTRIBUTION_MIRROR=$CENTOS_MIRROR
export DIB_EPEL_MIRROR=$EPEL_MIRROR export DIB_EPEL_MIRROR=$EPEL_MIRROR
export STABLE_RELEASE=${STABLE_RELEASE:-""} export STABLE_RELEASE=${STABLE_RELEASE:-""}
cat <<EOF >$HOME/undercloud-hieradata-override.yaml
ironic::drivers::deploy::http_port: 3816
EOF
echo '[DEFAULT]' > ~/undercloud.conf echo '[DEFAULT]' > ~/undercloud.conf
echo "hieradata_override = $HOME/undercloud-hieradata-override.yaml" >> ~/undercloud.conf
if [ $UNDERCLOUD_SSL == 1 ] ; then if [ $UNDERCLOUD_SSL == 1 ] ; then
echo 'generate_service_certificate = True' >> ~/undercloud.conf echo 'generate_service_certificate = True' >> ~/undercloud.conf

8
toci_instack_ovb.sh
View File

@ -22,8 +22,12 @@ MY_IP=$(ip addr show dev $IP_DEVICE | awk '/inet / {gsub("/.*", "") ; print $2}'
hostname | sudo dd of=/etc/hostname hostname | sudo dd of=/etc/hostname
echo "127.0.0.1 $(hostname) $(hostname).openstacklocal" | sudo tee -a /etc/hosts echo "127.0.0.1 $(hostname) $(hostname).openstacklocal" | sudo tee -a /etc/hosts
# Kill the zuul console stream, its tcp port clashes with the port we're using to serve out /httpboot if [ -n "$STABLE_RELEASE" ]; then
sudo netstat -lpn | grep tcp | grep :8088 | awk '{print $7}' | cut -d / -f 1 | head -n 1 | sudo xargs -t kill -9 || true # Kill the zuul console stream, its tcp port clashes with the port we're using to serve out /httpboot
# This is not needed on master since we're able to configure a different
# port for httpd ipxe using hieradata_override
sudo netstat -lpn | grep tcp | grep :8088 | awk '{print $7}' | cut -d / -f 1 | head -n 1 | sudo xargs -t kill
fi
# TODO: xfsprogs should be a dep of DIB? # TODO: xfsprogs should be a dep of DIB?
sudo yum install -y xfsprogs qemu-img sudo yum install -y xfsprogs qemu-img