Changed cassandra charm to lp:~charmers/charms/trusty/cassandra/trunk

Change-Id: I951bb23040ae50d371a8754628cf2e624889fdd3
Signed-off-by: Stuart Mackie <wsmackie@juniper.net>

11 files changed, 0 insertions, 4 deletions

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
--- a/charms/trusty/cassandra/.bzr/repository/indices/b2ff4c83d0b0f30e7527867288318107.cix
+++ /dev/null
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
--- a/charms/trusty/cassandra/.bzr/repository/indices/b2ff4c83d0b0f30e7527867288318107.rix
+++ /dev/null
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
--- a/charms/trusty/cassandra/.bzr/repository/indices/b2ff4c83d0b0f30e7527867288318107.tix
+++ /dev/null
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
--- /dev/null
+++ b/charms/trusty/cassandra/.bzr/repository/indices/bd29d17819901bc7cbdfcadea5fc98bc.cix
diff --git a/charms/trusty/cassandra/.bzr/repository/indices/b2ff4c83d0b0f30e7527867288318107.iix b/charms/trusty/cassandra/.bzr/repository/indices/bd29d17819901bc7cbdfcadea5fc98bc.iix
index adccde0..f37bc1f 100644
--- a/charms/trusty/cassandra/.bzr/repository/indices/b2ff4c83d0b0f30e7527867288318107.iix
+++ b/charms/trusty/cassandra/.bzr/repository/indices/bd29d17819901bc7cbdfcadea5fc98bc.iix
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
--- /dev/null
+++ b/charms/trusty/cassandra/.bzr/repository/indices/bd29d17819901bc7cbdfcadea5fc98bc.rix
diff --git a/charms/trusty/cassandra/.bzr/repository/indices/b2ff4c83d0b0f30e7527867288318107.six b/charms/trusty/cassandra/.bzr/repository/indices/bd29d17819901bc7cbdfcadea5fc98bc.six
index d6e0f15..d6e0f15 100644
--- a/charms/trusty/cassandra/.bzr/repository/indices/b2ff4c83d0b0f30e7527867288318107.six
+++ b/charms/trusty/cassandra/.bzr/repository/indices/bd29d17819901bc7cbdfcadea5fc98bc.six
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
--- /dev/null
+++ b/charms/trusty/cassandra/.bzr/repository/indices/bd29d17819901bc7cbdfcadea5fc98bc.tix
diff --git a/charms/trusty/cassandra/.bzr/repository/pack-names b/charms/trusty/cassandra/.bzr/repository/pack-names
index f3fd19b..e431fb6 100644
--- a/charms/trusty/cassandra/.bzr/repository/pack-names
+++ b/charms/trusty/cassandra/.bzr/repository/pack-names
diff --git a/charms/trusty/cassandra/.bzr/repository/packs/b2ff4c83d0b0f30e7527867288318107.pack b/charms/trusty/cassandra/.bzr/repository/packs/bd29d17819901bc7cbdfcadea5fc98bc.pack
index c9f37e0..ccf6e57 100644
--- a/charms/trusty/cassandra/.bzr/repository/packs/b2ff4c83d0b0f30e7527867288318107.pack
+++ b/charms/trusty/cassandra/.bzr/repository/packs/bd29d17819901bc7cbdfcadea5fc98bc.pack
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