From d14e36fdb850b0519107d00b8badf1fdad44428c Mon Sep 17 00:00:00 2001 From: Matt Thompson Date: Wed, 25 Mar 2015 16:27:40 +0000 Subject: [PATCH] Update rabbitmq_package_url This change removes the temporary rabbitmq_package_url override set in gate-check-commit.sh and adds a group_vars entry so that o-a-d installations will download rabbitmq-server from mirror.rackspace.com. The role's default will remain pointed at the upstream rabbitmq.com mirror. Change-Id: I55b28f073a3ed3e0924cdd0007149bb1d9de21f7 Closes-Bug: #1436240 --- playbooks/inventory/group_vars/all.yml | 1 + scripts/gate-check-commit.sh | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/playbooks/inventory/group_vars/all.yml b/playbooks/inventory/group_vars/all.yml index 5f234e89cd..5eecdcc481 100644 --- a/playbooks/inventory/group_vars/all.yml +++ b/playbooks/inventory/group_vars/all.yml @@ -54,6 +54,7 @@ rabbitmq_userid: openstack rabbitmq_cluster_name: openstack rabbitmq_port: 5672 rabbitmq_servers: "{% for host in groups['rabbitmq_all'] %}{{ hostvars[host]['container_address'] }}:{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %}" +rabbitmq_package_url: "https://mirror.rackspace.com/rackspaceprivatecloud/downloads/rabbitmq-server_3.4.3-1_all.deb" ## Galera diff --git a/scripts/gate-check-commit.sh b/scripts/gate-check-commit.sh index a639354edb..f10892213b 100755 --- a/scripts/gate-check-commit.sh +++ b/scripts/gate-check-commit.sh @@ -40,8 +40,6 @@ export SYMLINK_DIR=${SYMLINK_DIR:-"$(pwd)/logs"} # tempest and testr options, default is to run tempest in serial export RUN_TEMPEST_OPTS=${RUN_TEMPEST_OPTS:-'--serial'} export TESTR_OPTS=${TESTR_OPTS:-''} -# Temporarily override rabbitmq_package_url (see bug #1436240) -export RABBITMQ_PACKAGE_URL="http://rpc.cloudnull.io/downloads/rabbitmq-server_3.4.3-1_all.deb" # enable fatal deprecation warnings export CINDER_FATAL_DEPRECATIONS=yes