Juju Charms Collection
etcd package

Merge lp:~kubernetes/charms/trusty/etcd/trunk into lp:charms/trusty/etcd

  1. Trusty Tahr (14.04)
  2. trunk
  3. Merge into trunk
Proposed by Charles Butler on 2015-07-24
Status: Merged
Merged at revision: 16
Proposed branch: lp:~kubernetes/charms/trusty/etcd/trunk
Merge into: lp:charms/trusty/etcd
Diff against target: 23 lines (+2/-2)
2 files modified
config.yaml (+1/-1)
hooks/hooks.py (+1/-1)
To merge this branch: bzr merge lp:~kubernetes/charms/trusty/etcd/trunk
Reviewer Review Type Date Requested Status
Marco Ceppi 2015-07-24 Approve on 2015-08-07
Review via email: mp+265870@code.launchpad.net

Description of the Change

This is a complete rename of a config option predicated by bug:
https://bugs.launchpad.net/charms/+source/etcd/+bug/1478121

the `source` option collides with an option of similar name in the openstack charms.

To post a comment you must log in.
Marco Ceppi (marcoceppi) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.yaml'
2--- config.yaml 2015-07-13 16:56:39 +0000
3+++ config.yaml 2015-07-24 19:31:45 +0000
4@@ -1,5 +1,5 @@
5 options:
6- source:
7+ bin-source:
8 type: string
9 default: https://github.com/coreos/etcd/releases/download/v2.0.11/etcd-v2.0.11-linux-amd64.tar.gz
10 description: Location of etcd binary release to fetch
11
12=== modified file 'hooks/hooks.py'
13--- hooks/hooks.py 2015-07-13 16:56:39 +0000
14+++ hooks/hooks.py 2015-07-24 19:31:45 +0000
15@@ -130,7 +130,7 @@
16
17
18 def install_etcd():
19- source = hookenv.config('source')
20+ source = hookenv.config('bin-source')
21 sha = hookenv.config('source-sum')
22
23 unpack = fetch.install_remote(source, 'fetched', sha)

Subscribers

People subscribed via source and target branches

to all changes: