charm-k8s-wordpress

Merge ~barryprice/charm-k8s-wordpress/+git/charm-k8s-wordpress:master into charm-k8s-wordpress:master

  1. Git
  2. lp:~barryprice/charm-k8s-wordpress/+git/charm-k8s-wordpress
  3. master
  4. Merge into master
Proposed by Barry Price
Status: Merged
Approved by: Haw Loeung
Approved revision: d93bf45e26c29b5ced83c393e3fbce0e63f85835
Merged at revision: e43d719ced6f9f221dfff17e734b2b03e0baabee
Proposed branch: ~barryprice/charm-k8s-wordpress/+git/charm-k8s-wordpress:master
Merge into: charm-k8s-wordpress:master
Diff against target: 13 lines (+1/-1)
1 file modified
src/charm.py (+1/-1)
Reviewer Review Type Date Requested Status
Haw Loeung +1 Approve
Canonical IS Reviewers Pending
Review via email: mp+384072@code.launchpad.net

Commit message

Load wp_plugin_swift_config as YAML, not a string

To post a comment you must log in.
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
Haw Loeung (hloeung) wrote :

LGTM

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

Change successfully merged at revision e43d719ced6f9f221dfff17e734b2b03e0baabee

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/charm.py b/src/charm.py
2index e9c87ee..906a0e4 100755
3--- a/src/charm.py
4+++ b/src/charm.py
5@@ -44,7 +44,7 @@ def generate_pod_config(config, secured=True):
6 pod_config["WP_PLUGIN_AKISMET_KEY"] = config["wp_plugin_akismet_key"]
7 if config.get("wp_plugin_openstack-objectstorage_config"):
8 # actual plugin name is 'openstack-objectstorage', but 'swift' will do us!
9- wp_plugin_swift_config = config.get("wp_plugin_openstack-objectstorage_config")
10+ wp_plugin_swift_config = safe_load(config.get("wp_plugin_openstack-objectstorage_config"))
11 pod_config["SWIFT_AUTH_URL"] = wp_plugin_swift_config.get('auth-url')
12 pod_config["SWIFT_BUCKET"] = wp_plugin_swift_config.get('bucket')
13 pod_config["SWIFT_PASSWORD"] = wp_plugin_swift_config.get('password')

Subscribers

People subscribed via source and target branches