From: Loic Dachary <ldachary@redhat.com>
Date: Mon, 28 Mar 2016 16:38:19 +0000 (+0200)
Subject: openstack: apt-get install --force-yes
X-Git-Tag: 1.1.0~211^2~69
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d20ce6278700b09416c7f296a1364a85c2007c46;p=teuthology.git

openstack: apt-get install --force-yes

So that the setup is not disturbed by temporary signature breakage which
sometime happens on the Ubuntu repo.

Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/teuthology/openstack/setup-openstack.sh b/teuthology/openstack/setup-openstack.sh
index 88248f0f86..bcb263de6d 100755
--- a/teuthology/openstack/setup-openstack.sh
+++ b/teuthology/openstack/setup-openstack.sh
@@ -133,7 +133,7 @@ function setup_paddles() {
         git clone https://github.com/ceph/paddles.git $paddles_dir || return 1
     fi
 
-    sudo apt-get -qq install -y beanstalkd postgresql postgresql-contrib postgresql-server-dev-all supervisor
+    sudo apt-get -qq install -y --force-yes beanstalkd postgresql postgresql-contrib postgresql-server-dev-all supervisor
 
     if ! sudo /etc/init.d/postgresql status ; then
         sudo mkdir -p /etc/postgresql
@@ -228,7 +228,7 @@ function setup_pulpito() {
         git clone https://github.com/ceph/pulpito.git $pulpito_dir || return 1
     fi
 
-    sudo apt-get -qq install -y nginx
+    sudo apt-get -qq install -y --force-yes nginx
     local nginx_conf=/etc/nginx/sites-available/default
     if ! grep -qq 'autoindex on' $nginx_conf ; then
         sudo perl -pi -e 's|location / {|location / { autoindex on;|' $nginx_conf
@@ -372,7 +372,7 @@ function setup_dnsmasq() {
 
     if ! test -f /etc/dnsmasq.d/resolv ; then
         resolver=$(grep nameserver /etc/resolv.conf | head -1 | perl -ne 'print $1 if(/\s*nameserver\s+([\d\.]+)/)')
-        sudo apt-get -qq install -y dnsmasq resolvconf
+        sudo apt-get -qq install -y --force-yes dnsmasq resolvconf
         echo resolv-file=/etc/dnsmasq-resolv.conf | sudo tee /etc/dnsmasq.d/resolv
         echo nameserver $resolver | sudo tee /etc/dnsmasq-resolv.conf
         # restart is not always picking up changes
@@ -470,8 +470,8 @@ function install_packages() {
         sudo apt-get update
     fi
 
-    local packages="jq realpath"
-    sudo apt-get -qq install -y $packages
+    local packages="jq realpath curl"
+    sudo apt-get -qq install -y --force-yes $packages
 
     echo "INSTALL required packages $packages"
 }