From c6fafdeceefaa82f5960acf462d916370e52bc75 Mon Sep 17 00:00:00 2001 From: Stuart Mackie Date: Tue, 18 Oct 2016 20:06:42 -0700 Subject: Changed cassandra charm to lp:~charmers/charms/trusty/cassandra/trunk Change-Id: I951bb23040ae50d371a8754628cf2e624889fdd3 Signed-off-by: Stuart Mackie --- .../indices/b2ff4c83d0b0f30e7527867288318107.cix | Bin 26592 -> 0 bytes .../indices/b2ff4c83d0b0f30e7527867288318107.iix | Bin 27223 -> 0 bytes .../indices/b2ff4c83d0b0f30e7527867288318107.rix | Bin 27284 -> 0 bytes .../indices/b2ff4c83d0b0f30e7527867288318107.six | Bin 14814 -> 0 bytes .../indices/b2ff4c83d0b0f30e7527867288318107.tix | Bin 79199 -> 0 bytes .../indices/bd29d17819901bc7cbdfcadea5fc98bc.cix | Bin 0 -> 26558 bytes .../indices/bd29d17819901bc7cbdfcadea5fc98bc.iix | Bin 0 -> 27223 bytes .../indices/bd29d17819901bc7cbdfcadea5fc98bc.rix | Bin 0 -> 27253 bytes .../indices/bd29d17819901bc7cbdfcadea5fc98bc.six | Bin 0 -> 14814 bytes .../indices/bd29d17819901bc7cbdfcadea5fc98bc.tix | Bin 0 -> 79200 bytes charms/trusty/cassandra/.bzr/repository/pack-names | Bin 149 -> 148 bytes .../packs/b2ff4c83d0b0f30e7527867288318107.pack | Bin 641193 -> 0 bytes .../packs/bd29d17819901bc7cbdfcadea5fc98bc.pack | Bin 0 -> 637906 bytes .../cassandra/hooks/charmhelpers/fetch/__init__.py | 4 ---- 14 files changed, 4 deletions(-) delete mode 100644 charms/trusty/cassandra/.bzr/repository/indices/b2ff4c83d0b0f30e7527867288318107.cix delete mode 100644 charms/trusty/cassandra/.bzr/repository/indices/b2ff4c83d0b0f30e7527867288318107.iix delete mode 100644 charms/trusty/cassandra/.bzr/repository/indices/b2ff4c83d0b0f30e7527867288318107.rix delete mode 100644 charms/trusty/cassandra/.bzr/repository/indices/b2ff4c83d0b0f30e7527867288318107.six delete mode 100644 charms/trusty/cassandra/.bzr/repository/indices/b2ff4c83d0b0f30e7527867288318107.tix create mode 100644 charms/trusty/cassandra/.bzr/repository/indices/bd29d17819901bc7cbdfcadea5fc98bc.cix create mode 100644 charms/trusty/cassandra/.bzr/repository/indices/bd29d17819901bc7cbdfcadea5fc98bc.iix create mode 100644 charms/trusty/cassandra/.bzr/repository/indices/bd29d17819901bc7cbdfcadea5fc98bc.rix create mode 100644 charms/trusty/cassandra/.bzr/repository/indices/bd29d17819901bc7cbdfcadea5fc98bc.six create mode 100644 charms/trusty/cassandra/.bzr/repository/indices/bd29d17819901bc7cbdfcadea5fc98bc.tix delete mode 100644 charms/trusty/cassandra/.bzr/repository/packs/b2ff4c83d0b0f30e7527867288318107.pack create mode 100644 charms/trusty/cassandra/.bzr/repository/packs/bd29d17819901bc7cbdfcadea5fc98bc.pack diff --git a/charms/trusty/cassandra/.bzr/repository/indices/b2ff4c83d0b0f30e7527867288318107.cix b/charms/trusty/cassandra/.bzr/repository/indices/b2ff4c83d0b0f30e7527867288318107.cix deleted file mode 100644 index 62a8e1e..0000000 Binary files a/charms/trusty/cassandra/.bzr/repository/indices/b2ff4c83d0b0f30e7527867288318107.cix and /dev/null differ diff --git a/charms/trusty/cassandra/.bzr/repository/indices/b2ff4c83d0b0f30e7527867288318107.iix b/charms/trusty/cassandra/.bzr/repository/indices/b2ff4c83d0b0f30e7527867288318107.iix deleted file mode 100644 index adccde0..0000000 Binary files a/charms/trusty/cassandra/.bzr/repository/indices/b2ff4c83d0b0f30e7527867288318107.iix and /dev/null differ diff --git a/charms/trusty/cassandra/.bzr/repository/indices/b2ff4c83d0b0f30e7527867288318107.rix b/charms/trusty/cassandra/.bzr/repository/indices/b2ff4c83d0b0f30e7527867288318107.rix deleted file mode 100644 index 3a4e8f1..0000000 Binary files a/charms/trusty/cassandra/.bzr/repository/indices/b2ff4c83d0b0f30e7527867288318107.rix and /dev/null differ diff --git a/charms/trusty/cassandra/.bzr/repository/indices/b2ff4c83d0b0f30e7527867288318107.six b/charms/trusty/cassandra/.bzr/repository/indices/b2ff4c83d0b0f30e7527867288318107.six deleted file mode 100644 index d6e0f15..0000000 Binary files a/charms/trusty/cassandra/.bzr/repository/indices/b2ff4c83d0b0f30e7527867288318107.six and /dev/null differ diff --git a/charms/trusty/cassandra/.bzr/repository/indices/b2ff4c83d0b0f30e7527867288318107.tix b/charms/trusty/cassandra/.bzr/repository/indices/b2ff4c83d0b0f30e7527867288318107.tix deleted file mode 100644 index ba00536..0000000 Binary files a/charms/trusty/cassandra/.bzr/repository/indices/b2ff4c83d0b0f30e7527867288318107.tix and /dev/null differ diff --git a/charms/trusty/cassandra/.bzr/repository/indices/bd29d17819901bc7cbdfcadea5fc98bc.cix b/charms/trusty/cassandra/.bzr/repository/indices/bd29d17819901bc7cbdfcadea5fc98bc.cix new file mode 100644 index 0000000..eab3024 Binary files /dev/null and b/charms/trusty/cassandra/.bzr/repository/indices/bd29d17819901bc7cbdfcadea5fc98bc.cix differ diff --git a/charms/trusty/cassandra/.bzr/repository/indices/bd29d17819901bc7cbdfcadea5fc98bc.iix b/charms/trusty/cassandra/.bzr/repository/indices/bd29d17819901bc7cbdfcadea5fc98bc.iix new file mode 100644 index 0000000..f37bc1f Binary files /dev/null and b/charms/trusty/cassandra/.bzr/repository/indices/bd29d17819901bc7cbdfcadea5fc98bc.iix differ diff --git a/charms/trusty/cassandra/.bzr/repository/indices/bd29d17819901bc7cbdfcadea5fc98bc.rix b/charms/trusty/cassandra/.bzr/repository/indices/bd29d17819901bc7cbdfcadea5fc98bc.rix new file mode 100644 index 0000000..fd72f89 Binary files /dev/null and b/charms/trusty/cassandra/.bzr/repository/indices/bd29d17819901bc7cbdfcadea5fc98bc.rix differ diff --git a/charms/trusty/cassandra/.bzr/repository/indices/bd29d17819901bc7cbdfcadea5fc98bc.six b/charms/trusty/cassandra/.bzr/repository/indices/bd29d17819901bc7cbdfcadea5fc98bc.six new file mode 100644 index 0000000..d6e0f15 Binary files /dev/null and b/charms/trusty/cassandra/.bzr/repository/indices/bd29d17819901bc7cbdfcadea5fc98bc.six differ diff --git a/charms/trusty/cassandra/.bzr/repository/indices/bd29d17819901bc7cbdfcadea5fc98bc.tix b/charms/trusty/cassandra/.bzr/repository/indices/bd29d17819901bc7cbdfcadea5fc98bc.tix new file mode 100644 index 0000000..e53c4c4 Binary files /dev/null and b/charms/trusty/cassandra/.bzr/repository/indices/bd29d17819901bc7cbdfcadea5fc98bc.tix differ diff --git a/charms/trusty/cassandra/.bzr/repository/pack-names b/charms/trusty/cassandra/.bzr/repository/pack-names index f3fd19b..e431fb6 100644 Binary files a/charms/trusty/cassandra/.bzr/repository/pack-names and b/charms/trusty/cassandra/.bzr/repository/pack-names differ diff --git a/charms/trusty/cassandra/.bzr/repository/packs/b2ff4c83d0b0f30e7527867288318107.pack b/charms/trusty/cassandra/.bzr/repository/packs/b2ff4c83d0b0f30e7527867288318107.pack deleted file mode 100644 index c9f37e0..0000000 Binary files a/charms/trusty/cassandra/.bzr/repository/packs/b2ff4c83d0b0f30e7527867288318107.pack and /dev/null differ diff --git a/charms/trusty/cassandra/.bzr/repository/packs/bd29d17819901bc7cbdfcadea5fc98bc.pack b/charms/trusty/cassandra/.bzr/repository/packs/bd29d17819901bc7cbdfcadea5fc98bc.pack new file mode 100644 index 0000000..ccf6e57 Binary files /dev/null and b/charms/trusty/cassandra/.bzr/repository/packs/bd29d17819901bc7cbdfcadea5fc98bc.pack differ 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 -- cgit 1.2.3-korg