openstack/openstack-ansible
Code Issues Proposed changes

Unblock master gating

Browse Source 
Most of master is transitioning to the liberty cycle, to allow us
to continue gating the service install versions is being set back
to the head of the stable/kilo branch. This should be updated once
all upstream OpenStack projects fully transition to Liberty.

This adds a wait condition when creating the containers to ensure
that the containers are created correctly and that ssh is available
within them before actually continuing with the installation process

This change forces the apt mirrors to use a set that is known good.
The previous changes to set the mirrors to the same as what was
already on the host has proven itself to be a greater issue by not
using a set that is known to be in good working order.

Change-Id: I1872a32b53b9caecb8ac0803db304fa0ee254475
Closes-Bug: 1441148
This commit is contained in:
Kevin Carter 2015-04-29 07:47:40 -05:00
parent 0e733ce6b5
commit 09a46d9775
4 changed files with 45 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
playbooks/lxc-containers-create.yml
View File

@ -20,6 +20,16 @@
user: root user: root
roles: roles:
- { role: "lxc_container_create", tags: [ "lxc-container-create" ] } - { role: "lxc_container_create", tags: [ "lxc-container-create" ] }
post_tasks:
- name: Wait for ssh to be available
local_action:
module: wait_for
port: "{{ ansible_ssh_port | default('22') }}"
host: "{{ ansible_ssh_host | default(inventory_hostname) }}"
search_regex: OpenSSH
delay: 1
tags:
- lxc-container-wait-for-ssh
vars: vars:
ansible_hostname: "{{ container_name }}" ansible_hostname: "{{ container_name }}"
is_metal: "{{ properties.is_metal|default(false) }}" is_metal: "{{ properties.is_metal|default(false) }}"

4
playbooks/vars/repo_packages/openstack_other.yml
View File

@ -26,13 +26,13 @@
## Glance store library ## Glance store library
glancestore_git_repo: https://github.com/openstack/glance_store glancestore_git_repo: https://github.com/openstack/glance_store
glancestore_git_install_branch: 0.4.0 glancestore_git_install_branch: e8884d2cb31c3364d353619a8b446ec89da547b8 # HEAD of "master" as of 20.04.2015
glancestore_git_dest: "/opt/glancestore_{{ glancestore_git_repo | replace('/', '_') }}" glancestore_git_dest: "/opt/glancestore_{{ glancestore_git_repo | replace('/', '_') }}"
## Global Requirements ## Global Requirements
requirements_git_repo: https://github.com/openstack/requirements requirements_git_repo: https://github.com/openstack/requirements
requirements_git_install_branch: master requirements_git_install_branch: 7da0b687622932e84a7c7859f4ce474b7062ecd3 # HEAD of "master" as of 23.04.2015
requirements_git_dest: "/opt/requirements_{{ requirements_git_install_branch | replace('/', '_') }}" requirements_git_dest: "/opt/requirements_{{ requirements_git_install_branch | replace('/', '_') }}"

24
playbooks/vars/repo_packages/openstack_services.yml
View File

@ -30,19 +30,19 @@
## Cinder service ## Cinder service
cinder_git_repo: https://github.com/openstack/cinder cinder_git_repo: https://github.com/openstack/cinder
cinder_git_install_branch: master cinder_git_install_branch: 9690c2dcd02442e47bf215ede1d52333999a55a3 # HEAD of "master" as of 20.04.2015
cinder_git_dest: "/opt/cinder_{{ cinder_git_install_branch | replace('/', '_') }}" cinder_git_dest: "/opt/cinder_{{ cinder_git_install_branch | replace('/', '_') }}"
## Glance service ## Glance service
glance_git_repo: https://github.com/openstack/glance glance_git_repo: https://github.com/openstack/glance
glance_git_install_branch: master glance_git_install_branch: 20ec82f18c368bbc8a89e79d2d6eee2de2c2a9ea # HEAD of "master" as of 20.04.2015
glance_git_dest: "/opt/glance_{{ glance_git_install_branch | replace('/', '_') }}" glance_git_dest: "/opt/glance_{{ glance_git_install_branch | replace('/', '_') }}"
## Heat service ## Heat service
heat_git_repo: https://github.com/openstack/heat heat_git_repo: https://github.com/openstack/heat
heat_git_install_branch: master heat_git_install_branch: 5854f1d121d11faebd6e962e251d2e84bda801de # HEAD of "master" as of 20.04.2015
heat_git_dest: "/opt/heat_{{ heat_git_install_branch | replace('/', '_') }}" heat_git_dest: "/opt/heat_{{ heat_git_install_branch | replace('/', '_') }}"
heat_repo_plugins: heat_repo_plugins:
- { path: "contrib", package: "extraroute" } - { path: "contrib", package: "extraroute" }
@ -50,47 +50,47 @@ heat_repo_plugins:
## Horizon service ## Horizon service
horizon_git_repo: https://github.com/openstack/horizon horizon_git_repo: https://github.com/openstack/horizon
horizon_git_install_branch: master horizon_git_install_branch: 9f8c35c9e479ebd480a111167cafed4371df665a # HEAD of "master" as of 22.04.2015
horizon_git_dest: "/opt/horizon_{{ horizon_git_install_branch | replace('/', '_') }}" horizon_git_dest: "/opt/horizon_{{ horizon_git_install_branch | replace('/', '_') }}"
## Keystone service ## Keystone service
keystone_git_repo: https://github.com/openstack/keystone keystone_git_repo: https://github.com/openstack/keystone
keystone_git_install_branch: master keystone_git_install_branch: fbf8985903fcf528e4636cb39880e3ab94c079c0 # HEAD of "master" as of 20.04.2015
keystone_git_dest: "/opt/keystone_{{ keystone_git_install_branch | replace('/', '_') }}" keystone_git_dest: "/opt/keystone_{{ keystone_git_install_branch | replace('/', '_') }}"
## Neutron service ## Neutron service
neutron_git_repo: https://github.com/openstack/neutron neutron_git_repo: https://github.com/openstack/neutron
neutron_git_install_branch: master neutron_git_install_branch: cc020dc930d88ae0419a650ad0c268b23f9e9ebe # HEAD of "master" as of 20.04.2015
neutron_git_dest: "/opt/neutron_{{ neutron_git_install_branch | replace('/', '_') }}" neutron_git_dest: "/opt/neutron_{{ neutron_git_install_branch | replace('/', '_') }}"
neutron_lbaas_git_repo: https://github.com/openstack/neutron-lbaas neutron_lbaas_git_repo: https://github.com/openstack/neutron-lbaas
neutron_lbaas_git_install_branch: master neutron_lbaas_git_install_branch: 700da77315d609ee02ba1a031df681d51abf2eab # HEAD of "master" as of 20.04.2015
neutron_lbaas_git_dest: "/opt/neutron_lbaas_{{ neutron_lbaas_git_install_branch | replace('/', '_') }}" neutron_lbaas_git_dest: "/opt/neutron_lbaas_{{ neutron_lbaas_git_install_branch | replace('/', '_') }}"
neutron_vpnaas_git_repo: https://github.com/openstack/neutron-vpnaas neutron_vpnaas_git_repo: https://github.com/openstack/neutron-vpnaas
neutron_vpnaas_git_install_branch: master neutron_vpnaas_git_install_branch: 0782a2ba25cd8fce8c735c84fadd2fa9b670f418 # HEAD of "master" as of 20.04.2015
neutron_vpnaas_git_dest: "/opt/neutron_vpnaas_{{ neutron_vpnaas_git_install_branch | replace('/', '_') }}" neutron_vpnaas_git_dest: "/opt/neutron_vpnaas_{{ neutron_vpnaas_git_install_branch | replace('/', '_') }}"
neutron_fwaas_git_repo: https://github.com/openstack/neutron-fwaas neutron_fwaas_git_repo: https://github.com/openstack/neutron-fwaas
neutron_fwaas_git_install_branch: master neutron_fwaas_git_install_branch: ba861cf9b9fd345626e2c4e9d3307b74825d5eea # HEAD of "master" as of 20.04.2015
neutron_fwaas_git_dest: "/opt/neutron_fwaas_{{ neutron_fwaas_git_install_branch | replace('/', '_') }}" neutron_fwaas_git_dest: "/opt/neutron_fwaas_{{ neutron_fwaas_git_install_branch | replace('/', '_') }}"
## Nova service ## Nova service
nova_git_repo: https://github.com/openstack/nova nova_git_repo: https://github.com/openstack/nova
nova_git_install_branch: master nova_git_install_branch: e77edeee0e7bf4c710b42023da6d9ae2e31cd8b1 # HEAD of "master" as of 20.04.2015
nova_git_dest: "/opt/nova_{{ nova_git_install_branch | replace('/', '_') }}" nova_git_dest: "/opt/nova_{{ nova_git_install_branch | replace('/', '_') }}"
## Swift service ## Swift service
swift_git_repo: https://github.com/openstack/swift swift_git_repo: https://github.com/openstack/swift
swift_git_install_branch: master swift_git_install_branch: 843236a635049d0a05d69f47aa675f90641c025d # HEAD of "master" as of 20.04.2015
swift_git_dest: "/opt/swift_{{ swift_git_install_branch | replace('/', '_') }}" swift_git_dest: "/opt/swift_{{ swift_git_install_branch | replace('/', '_') }}"
## Tempest service ## Tempest service
tempest_git_repo: https://github.com/openstack/tempest tempest_git_repo: https://github.com/openstack/tempest
tempest_git_install_branch: d1a391a55482d64b9014e7b41219af195722d990 # SHA at the head of master as of 20.3.2015 tempest_git_install_branch: d1a391a55482d64b9014e7b41219af195722d990 # HEAD of "master" as of 20.3.2015
tempest_git_dest: "/opt/tempest_{{ tempest_git_install_branch | replace('/', '_') }}" tempest_git_dest: "/opt/tempest_{{ tempest_git_install_branch | replace('/', '_') }}"

27
scripts/bootstrap-aio.sh
View File

@ -30,7 +30,6 @@ export TEMPEST_FLAT_CIDR=${TEMPEST_FLAT_CIDR:-"172.29.248.0/22"}
export FLUSH_IPTABLES=${FLUSH_IPTABLES:-"yes"} export FLUSH_IPTABLES=${FLUSH_IPTABLES:-"yes"}
export RABBITMQ_PACKAGE_URL=${RABBITMQ_PACKAGE_URL:-""} export RABBITMQ_PACKAGE_URL=${RABBITMQ_PACKAGE_URL:-""}
export SYMLINK_DIR=${SYMLINK_DIR:-"$(pwd)/logs"} 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 # Default disabled fatal deprecation warnings
export CINDER_FATAL_DEPRECATIONS=${CINDER_FATAL_DEPRECATIONS:-"no"} export CINDER_FATAL_DEPRECATIONS=${CINDER_FATAL_DEPRECATIONS:-"no"}
@ -41,6 +40,11 @@ export NEUTRON_FATAL_DEPRECATIONS=${NEUTRON_FATAL_DEPRECATIONS:-"no"}
export NOVA_FATAL_DEPRECATIONS=${NOVA_FATAL_DEPRECATIONS:-"no"} export NOVA_FATAL_DEPRECATIONS=${NOVA_FATAL_DEPRECATIONS:-"no"}
export TEMPEST_FATAL_DEPRECATIONS=${TEMPEST_FATAL_DEPRECATIONS:-"no"} export TEMPEST_FATAL_DEPRECATIONS=${TEMPEST_FATAL_DEPRECATIONS:-"no"}
# Ubuntu repos
UBUNTU_RELEASE=$(lsb_release -sc)
UBUNTU_REPO=${UBUNTU_REPO:-"http://mirror.rackspace.com/ubuntu"}
UBUNTU_SEC_REPO=${UBUNTU_SEC_REPO:-"http://mirror.rackspace.com/ubuntu"}
## Library Check ------------------------------------------------------------- ## Library Check -------------------------------------------------------------
info_block "Checking for required libraries." 2> /dev/null || source $(dirname ${0})/scripts-library.sh info_block "Checking for required libraries." 2> /dev/null || source $(dirname ${0})/scripts-library.sh
@ -87,11 +91,22 @@ 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 echo -e '\n# Adding google name servers\nnameserver 8.8.8.8\nnameserver 8.8.4.4' | tee -a /etc/resolv.conf
fi fi
# Ensure that the ubuntu backports repo is in place # Set the host repositories to only use the same ones, always, for the sake of consistency.
# ref: https://bugs.launchpad.net/openstack-ansible/+bug/1448152 cat > /etc/apt/sources.list <<EOF
if ! grep -qrni "^deb .* $(lsb_release -sc)-backports" /etc/apt/sources.list*; then # Normal repositories
echo "deb ${UBUNTU_REPO} $(lsb_release -sc)-backports main restricted universe multiverse" > /etc/apt/sources.list.d/ubuntu-backports.list deb ${UBUNTU_REPO} ${UBUNTU_RELEASE} main restricted
fi deb ${UBUNTU_REPO} ${UBUNTU_RELEASE}-updates main restricted
deb ${UBUNTU_REPO} ${UBUNTU_RELEASE} universe
deb ${UBUNTU_REPO} ${UBUNTU_RELEASE}-updates universe
deb ${UBUNTU_REPO} ${UBUNTU_RELEASE} multiverse
deb ${UBUNTU_REPO} ${UBUNTU_RELEASE}-updates multiverse
# Backports repositories
deb ${UBUNTU_REPO} ${UBUNTU_RELEASE}-backports main restricted universe multiverse
# Security repositories
deb ${UBUNTU_SEC_REPO} ${UBUNTU_RELEASE}-security main restricted
deb ${UBUNTU_SEC_REPO} ${UBUNTU_RELEASE}-security universe
deb ${UBUNTU_SEC_REPO} ${UBUNTU_RELEASE}-security multiverse
EOF
# Update the package cache # Update the package cache
apt-get update apt-get update