Merge ~elmo/charm-memcached:juju-config-not-set into charm-memcached:master

Proposed by James Troup
Status: Merged
Approved by: James Troup
Approved revision: 291c846d8eecb394f2692bbcb21b9de313ce13f5
Merged at revision: 9b9ee3629e349e5ac1309214a660040228d6780c
Proposed branch: ~elmo/charm-memcached:juju-config-not-set
Merge into: charm-memcached:master
Diff against target: 63 lines (+6/-6)
3 files modified
README.md (+4/-4)
hooks/memcached_hooks.py (+1/-1)
hooks/replication.py (+1/-1)
Reviewer Review Type Date Requested Status
Celia Wang Approve
🤖 prod-jenkaas-bootstack (community) continuous-integration Approve
BootStack Reviewers Pending
Review via email: mp+406769@code.launchpad.net

Commit message

Replace references to 'juju set' with 'juju config'

To post a comment you must log in.
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

A CI job is currently in progress. A follow up comment will be added when it completes.

Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :
review: Approve (continuous-integration)
Revision history for this message
Celia Wang (ziyiwang) wrote :

lgtm

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 9b9ee3629e349e5ac1309214a660040228d6780c

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/README.md b/README.md
2index c6b831a..be2385b 100644
3--- a/README.md
4+++ b/README.md
5@@ -34,12 +34,12 @@ Then deploy a maximum of 2 units of memcached:
6 juju deploy -n 2 config.yaml memcached
7
8 **Caution** : As per design limitations, If you try to add another unit of memcached, all the units will be
9-set as standalone you decide to disable repcached by using `juju set memcached repcached=false` and re-deploy the
10+set as standalone you decide to disable repcached by using `juju config memcached repcached=false` and re-deploy the
11 unit.
12
13 Or you can deploy 2 units and then enable replication by running
14 juju deploy -n 2 memcached
15- juju set memcached repcached=true
16+ juju config memcached repcached=true
17
18
19 ### Removing a unit
20@@ -47,7 +47,7 @@ Or you can deploy 2 units and then enable replication by running
21 Removing one of the cluster units, means remove replication, please disable replication first
22 and then remove the unit safely.
23
24- juju set memcached repcached=false
25+ juju config memcached repcached=false
26 juju remove-unit memcached/0
27
28
29@@ -55,7 +55,7 @@ and then remove the unit safely.
30
31 For turning the replication support off on memcached, you need to run the following command:
32
33- juju set memcached repcached=false
34+ juju config memcached repcached=false
35
36 ## Example Usage
37
38diff --git a/hooks/memcached_hooks.py b/hooks/memcached_hooks.py
39index 796e8c4..657cdc3 100755
40--- a/hooks/memcached_hooks.py
41+++ b/hooks/memcached_hooks.py
42@@ -156,7 +156,7 @@ def cluster_relation_changed():
43 else:
44 msg = """This unit will be marked as failed because
45 Repcached replication only can take place between two units.
46- If you want to disable this set 'juju set repcached=false'"""
47+ If you want to disable this set 'juju config repcached=false'"""
48 log(msg, level="WARN")
49 raise Exception(msg)
50 except AttributeError:
51diff --git a/hooks/replication.py b/hooks/replication.py
52index 426d8cc..9c56a23 100644
53--- a/hooks/replication.py
54+++ b/hooks/replication.py
55@@ -41,7 +41,7 @@ def get_current_replica():
56 msg = """Cannot configure replication between more than 2 units,
57 all the units are going to be setup as standalone. Please
58 remove the remaining units with 'juju remove-unit', and
59- then set 'juju set memcached repcached=true' again"""
60+ then set 'juju config memcached repcached=true' again"""
61 log(msg, level="WARN")
62 else:
63 try:

Subscribers

People subscribed via source and target branches

to all changes: