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

[Barry Price]

Basic swift config for openstack-objectstorage plugin, no input validation yet

[Barry Price (barryprice)]

For context:

https://code.launchpad.net/~barryprice/charm-k8s-wordpress/+git/charm-k8s-wordpress/+merge/383120

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

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

[Tom Haddon (mthaddon)]

LGTM, although I don't think the comment is so useful

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision baf77967b42ecd7a846463cb7405c12cc860a18d

diff --git a/files/plugin_handler.py b/files/plugin_handler.py
index 4feb8f2..5c698af 100644
--- a/files/plugin_handler.py
+++ b/files/plugin_handler.py
@@ -83,6 +83,12 @@ def enable_openid(team_map):
     add_option("openid_teams_trust_list", encoded_team_map)
 
 
+def enable_swift(swift_config):
+    enable_plugin("openstack-objectstorage/objectstorage.php")
+    for k, v in swift_config.items():
+        add_option("object_storage_{}".format(k), v)
+
+
 def configure_wordpress():
     url = "http://localhost"
     sleep_time = 10
@@ -128,3 +134,19 @@ if __name__ == "__main__":
         team_map = os.getenv("WP_PLUGIN_OPENID_TEAM_MAP")
         if team_map:
             enable_openid(team_map)
+
+        swift_url = os.getenv("SWIFT_URL")
+        if swift_url:
+            swift_config = {}
+            swift_config['url'] = swift_url
+            swift_config['auth_url' = os.getenv("SWIFT_AUTH_URL")
+            swift_config['bucket'] = os.getenv("SWIFT_BUCKET")
+            swift_config['password'] = os.getenv("SWIFT_PASSWORD")
+            swift_config['prefix'] = os.getenv("SWIFT_PREFIX")
+            swift_config['region'] = os.getenv("SWIFT_REGION")
+            swift_config['tenant'] = os.getenv("SWIFT_TENANT")
+            swift_config['username'] = os.getenv("SWIFT_USERNAME")
+            swift_config['copy_to_swift'] = os.getenv("SWIFT_COPY_TO_SWIFT")
+            swift_config['serve_from_swift'] = os.getenv("SWIFT_SERVE_FROM_SWIFT")
+            swift_config['remove_local_file'] = os.getenv("SWIFT_REMOVE_LOCAL_FILE")
+            enable_swift(swift_config)