From 95f88bd27aa9a08fe5fc7163b43b1a0945532bbd Mon Sep 17 00:00:00 2001 From: Stuart Mackie Date: Thu, 1 Dec 2016 10:31:28 -0800 Subject: Add --force-yes option in correct place Change-Id: I443df72975ea0428e4254daa356c1daa4890ba52 Signed-off-by: Stuart Mackie --- charms/trusty/cassandra/hooks/helpers.py | 2 +- charms/trusty/cassandra/hooks/hooks.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charms/trusty/cassandra/hooks/helpers.py b/charms/trusty/cassandra/hooks/helpers.py index b86a6b1..c94788f 100644 --- a/charms/trusty/cassandra/hooks/helpers.py +++ b/charms/trusty/cassandra/hooks/helpers.py @@ -103,7 +103,7 @@ def install_packages(packages): # The DSE packages are huge, so this might take some time. status_set('maintenance', 'Installing packages') with autostart_disabled(['cassandra']): - fetch.apt_install(packages, fatal=True) + fetch.apt_install(packages, options="--force-yes", fatal=True) # FOR CHARMHELPERS diff --git a/charms/trusty/cassandra/hooks/hooks.py b/charms/trusty/cassandra/hooks/hooks.py index 5f7a0c6..ef38c20 100644 --- a/charms/trusty/cassandra/hooks/hooks.py +++ b/charms/trusty/cassandra/hooks/hooks.py @@ -35,7 +35,7 @@ def bootstrap(): packages = ['python3-bcrypt', 'python3-cassandra'] set_proxy() fetch.configure_sources(update=True) - fetch.apt_install(packages, options="--force-yes", fatal=True) + fetch.apt_install(packages,fatal=True) import bcrypt # NOQA: flake8 import cassandra # NOQA: flake8 -- cgit 1.2.3-korg