diff options
| author |   Stuart Mackie <wsmackie@juniper.net> | 2016-10-18 20:06:42 -0700 |
|---|---|---|
| committer | Stuart Mackie <wsmackie@juniper.net> | 2016-10-18 20:06:42 -0700 |
| commit | c6fafdeceefaa82f5960acf462d916370e52bc75 (patch) | |
| tree | 588ad6cdd549c4806be8b220d0b0180f83ee4dd6 /charms/trusty/cassandra/hooks/charmhelpers | |
| parent | 4faa7f927149a5c4ef7a03523f7bc14523cb9baa (diff) | |
Changed cassandra charm to lp:~charmers/charms/trusty/cassandra/trunk
Change-Id: I951bb23040ae50d371a8754628cf2e624889fdd3
Signed-off-by: Stuart Mackie <wsmackie@juniper.net>
Diffstat (limited to 'charms/trusty/cassandra/hooks/charmhelpers')
| -rw-r--r-- | charms/trusty/cassandra/hooks/charmhelpers/fetch/__init__.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/charms/trusty/cassandra/hooks/charmhelpers/fetch/__init__.py b/charms/trusty/cassandra/hooks/charmhelpers/fetch/__init__.py index 017a696..db0d86a 100644 --- a/charms/trusty/cassandra/hooks/charmhelpers/fetch/__init__.py +++ b/charms/trusty/cassandra/hooks/charmhelpers/fetch/__init__.py @@ -314,10 +314,6 @@ def add_source(source, key=None): key_file.flush() key_file.seek(0) subprocess.check_call(['apt-key', 'add', '-'], stdin=key_file) - elif 'http://' in key: - with NamedTemporaryFile('w+') as key_file: - subprocess.check_call(['wget', key, '-O-'], stdout=key_file) - subprocess.check_call(['apt-key', 'add', key_file.name]) else: # Note that hkp: is in no way a secure protocol. Using a # GPG key id is pointless from a security POV unless you |