openstack/openstack-ansible
Code Issues Proposed changes

Add ubuntu backports repository to AIO if it's not present

Browse Source 
The swift installation process requires access to the Ubuntu backports
repository to install the liberasurecode1 and liberasurecode-dev packages. In
the hpcloud environments used in OpenStack-CI the backport repository is not
implemented, so we need to ensure that it's there if it hasn't already been
configured. This patch does that as part of the AIO bootstrap process.

Additionally, heat now requires python-saharaclient >= 0.9.0 and we bump here
to allow heat to install successfully.

Note that both issues are causing the gate to fail and need to be addressed
together to get a successful gate.

Closes-Bug: #1448126
Closes-Bug: #1448152
Change-Id: I5d8c6f4eb7182129ab22defd70a50d78e7ffe86f
This commit is contained in:
Jesse Pretorius
2015-04-24 15:22:02 +01:00
committed by Matt Thompson
parent 6486b449b3
commit bdee1d5ac8
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/vars/repo_packages/openstack_clients.yml
View File

@@ -92,7 +92,7 @@ openstackclient_git_dest: "/opt/openstackclient_{{ openstackclient_git_install_b
## Sahara client
saharaclient_git_repo: https://github.com/openstack/python-saharaclient
saharaclient_git_install_branch: 0.7.7
saharaclient_git_install_branch: 0.9.0
saharaclient_git_dest: "/opt/saharaclient_{{ saharaclient_git_install_branch | replace('/', '_') }}"

8
scripts/bootstrap-aio.sh
View File

@@ -30,6 +30,7 @@ export TEMPEST_FLAT_CIDR=${TEMPEST_FLAT_CIDR:-"172.29.248.0/22"}
export FLUSH_IPTABLES=${FLUSH_IPTABLES:-"yes"}
export RABBITMQ_PACKAGE_URL=${RABBITMQ_PACKAGE_URL:-""}
export SYMLINK_DIR=${SYMLINK_DIR:-"$(pwd)/logs"}
export UBUNTU_REPO=$(awk "/^deb .*ubuntu $(lsb_release -sc) main/ {print \$2}" /etc/apt/sources.list)
# Default disabled fatal deprecation warnings
export CINDER_FATAL_DEPRECATIONS=${CINDER_FATAL_DEPRECATIONS:-"no"}
@@ -86,6 +87,12 @@ if [ ! "$(grep -e '^nameserver 8.8.8.8' -e '^nameserver 8.8.4.4' /etc/resolv.con
echo -e '\n# Adding google name servers\nnameserver 8.8.8.8\nnameserver 8.8.4.4' | tee -a /etc/resolv.conf
fi
# Ensure that the ubuntu backports repo is in place
# ref: https://bugs.launchpad.net/openstack-ansible/+bug/1448152
if ! grep -qrni "^deb .* $(lsb_release -sc)-backports" /etc/apt/sources.list*; then
echo "deb ${UBUNTU_REPO} $(lsb_release -sc)-backports main restricted universe multiverse" > /etc/apt/sources.list.d/ubuntu-backports.list
fi
# Update the package cache
apt-get update
@@ -286,7 +293,6 @@ echo 'galera_innodb_log_buffer_size: 32M' | tee -a /etc/openstack_deploy/user_va
echo "required_kernel: $(uname --kernel-release)" | tee -a /etc/openstack_deploy/user_variables.yml
# Set the Ubuntu apt repository used for containers to the same as the host
UBUNTU_REPO=$(awk '/^deb .*ubuntu trusty main/ {print $2}' /etc/apt/sources.list)
echo "lxc_container_template_main_apt_repo: ${UBUNTU_REPO}" | tee -a /etc/openstack_deploy/user_variables.yml
echo "lxc_container_template_security_apt_repo: ${UBUNTU_REPO}" | tee -a /etc/openstack_deploy/user_variables.yml