wordpress-charmers team mailing list archive

[Barry Price <barry.price@xxxxxxxxxxxxx>]

Barry Price has proposed merging ~barryprice/charm-k8s-wordpress/+git/charm-k8s-wordpress:master into charm-k8s-wordpress:master.

Commit message:
Load wp_plugin_swift_config as YAML, not a string

Requested reviews:
  Canonical IS Reviewers (canonical-is-reviewers)
  Wordpress Charmers (wordpress-charmers)

For more details, see:
https://code.launchpad.net/~barryprice/charm-k8s-wordpress/+git/charm-k8s-wordpress/+merge/384072
-- 
Your team Wordpress Charmers is requested to review the proposed merge of ~barryprice/charm-k8s-wordpress/+git/charm-k8s-wordpress:master into charm-k8s-wordpress:master.

diff --git a/src/charm.py b/src/charm.py
index e9c87ee..906a0e4 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -44,7 +44,7 @@ def generate_pod_config(config, secured=True):
         pod_config["WP_PLUGIN_AKISMET_KEY"] = config["wp_plugin_akismet_key"]
     if config.get("wp_plugin_openstack-objectstorage_config"):
         # actual plugin name is 'openstack-objectstorage', but 'swift' will do us!
-        wp_plugin_swift_config = config.get("wp_plugin_openstack-objectstorage_config")
+        wp_plugin_swift_config = safe_load(config.get("wp_plugin_openstack-objectstorage_config"))
         pod_config["SWIFT_AUTH_URL"] = wp_plugin_swift_config.get('auth-url')
         pod_config["SWIFT_BUCKET"] = wp_plugin_swift_config.get('bucket')
         pod_config["SWIFT_PASSWORD"] = wp_plugin_swift_config.get('password')