Merge "Change most keystoneclient commands to openstacklient in libs"
diff --git a/driver_certs/cinder_driver_cert.sh b/driver_certs/cinder_driver_cert.sh
index 8380dee..99b2c8e 100755
--- a/driver_certs/cinder_driver_cert.sh
+++ b/driver_certs/cinder_driver_cert.sh
@@ -24,6 +24,7 @@
source $TOP_DIR/functions
source $TOP_DIR/stackrc
source $TOP_DIR/openrc
+source $TOP_DIR/lib/infra
source $TOP_DIR/lib/tempest
source $TOP_DIR/lib/cinder
diff --git a/functions-common b/functions-common
index 0cecb0b..d92e39c 100644
--- a/functions-common
+++ b/functions-common
@@ -460,6 +460,17 @@
# Git Functions
# =============
+# Returns openstack release name for a given branch name
+# ``get_release_name_from_branch branch-name``
+function get_release_name_from_branch(){
+ local branch=$1
+ if [[ $branch =~ "stable/" ]]; then
+ echo ${branch#*/}
+ else
+ echo "master"
+ fi
+}
+
# git clone only if directory doesn't exist already. Since ``DEST`` might not
# be owned by the installation user, we create the directory and change the
# ownership to the proper user.
@@ -792,7 +803,9 @@
# install_package package [package ...]
function install_package() {
if is_ubuntu; then
- [[ "$NO_UPDATE_REPOS" = "True" ]] || apt_get update
+ # if there are transient errors pulling the updates, that's fine. It may
+ # be secondary repositories that we don't really care about.
+ [[ "$NO_UPDATE_REPOS" = "True" ]] || apt_get update || /bin/true
NO_UPDATE_REPOS=True
apt_get install "$@"
diff --git a/lib/nova_plugins/hypervisor-docker b/lib/nova_plugins/hypervisor-docker
index cdd9317..b5df19d 100644
--- a/lib/nova_plugins/hypervisor-docker
+++ b/lib/nova_plugins/hypervisor-docker
@@ -32,7 +32,7 @@
DOCKER_REGISTRY_PORT=${DOCKER_REGISTRY_PORT:-5042}
DOCKER_IMAGE=${DOCKER_IMAGE:-cirros:latest}
-DOCKER_IMAGE_NAME=cirros
+DOCKER_IMAGE_NAME=$DEFAULT_IMAGE_NAME
DOCKER_REGISTRY_IMAGE=${DOCKER_REGISTRY_IMAGE:-registry:latest}
DOCKER_REGISTRY_IMAGE_NAME=registry
DOCKER_REPOSITORY_NAME=${SERVICE_HOST}:${DOCKER_REGISTRY_PORT}/${DOCKER_IMAGE_NAME}
diff --git a/stackrc b/stackrc
index e362cd1..52105e6 100644
--- a/stackrc
+++ b/stackrc
@@ -284,6 +284,9 @@
openvz)
DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-ubuntu-12.04-x86_64}
IMAGE_URLS=${IMAGE_URLS:-"http://download.openvz.org/template/precreated/ubuntu-12.04-x86_64.tar.gz"};;
+ docker)
+ DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros}
+ IMAGE_URLS=${IMAGE_URLS:-};;
libvirt)
case "$LIBVIRT_TYPE" in
lxc) # the cirros root disk in the uec tarball is empty, so it will not work for lxc