From 7d400693b352803b8e3695cba3bf54a00ad1dcf4 Mon Sep 17 00:00:00 2001
From: Keerthan Mala <kmala@engineyard.com>
Date: Tue, 14 Jun 2016 15:46:27 -0600
Subject: [PATCH] feat(swift): add support for swift storage

---
 workflow-dev/tpl/deis-objectstorage-secret.yaml | 10 +++++++++-
 workflow-dev/tpl/generate_params.toml           | 12 ++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/workflow-dev/tpl/deis-objectstorage-secret.yaml b/workflow-dev/tpl/deis-objectstorage-secret.yaml
index 3799cc4..bee58f6 100644
--- a/workflow-dev/tpl/deis-objectstorage-secret.yaml
+++ b/workflow-dev/tpl/deis-objectstorage-secret.yaml
@@ -24,6 +24,14 @@ data: {{ if or (eq (env "STORAGE_TYPE") "gcs") (eq .storage "gcs")}}
   region: {{ or (env "S3_REGION") (.s3.region) | b64enc }}
   registry-bucket: {{ or (env "AWS_REGISTRY_BUCKET") (.s3.registry_bucket) | b64enc }}
   database-bucket: {{ or (env "AWS_DATABASE_BUCKET") (.s3.database_bucket) | b64enc }}
-  builder-bucket: {{ or (env "AWS_BUILDER_BUCKET") (.s3.builder_bucket) | b64enc }}{{else if or (eq (env "STORAGE_TYPE") "minio") (eq .storage "minio")}}
+  builder-bucket: {{ or (env "AWS_BUILDER_BUCKET") (.s3.builder_bucket) | b64enc }}{{ else if or (eq (env "STORAGE_TYPE") "swift") (eq .storage "swift")}}
+  username: {{ or (env "SWIFT_USERNAME") (.swift.username) | b64enc }}
+  password: {{ or (env "SWIFT_PASSWORD") (.swift.password) | b64enc }}
+  authurl: {{ or (env "SWIFT_AUTHURL") (.swift.authurl) | b64enc }}
+  tenant: {{ or (env "SWIFT_TENANT") (.swift.tenant) | b64enc }}
+  authversion: {{ or (env "SWIFT_AUTHVERSION") (.swift.authversion) | b64enc }}
+  registry-container: {{ or (env "SWIFT_REGISTRY_CONTAINER") (.swift.registry_container) | b64enc }}
+  database-container: {{ or (env "SWIFT_DATABASE_CONTAINER") (.swift.database_container) | b64enc }}
+  builder-container: {{ or (env "SWIFT_BUILDER_CONTAINER") (.swift.builder_container) | b64enc }}{{else if or (eq (env "STORAGE_TYPE") "minio") (eq .storage "minio")}}
   accesskey: OFRaUlkySlJXTVBUNlVNWFI2STU=
   secretkey: Z2JzdHJPdm90TU1jZzJzTWZHVWhBNWE2RXQvRUk1QUx0SUhzb2JZaw=={{ end }}
diff --git a/workflow-dev/tpl/generate_params.toml b/workflow-dev/tpl/generate_params.toml
index c9f5c04..157e883 100644
--- a/workflow-dev/tpl/generate_params.toml
+++ b/workflow-dev/tpl/generate_params.toml
@@ -17,6 +17,7 @@
 # - azure: Store persistent data in Azure's object storage
 # - gcs: Store persistent data in Google Cloud Storage
 # - minio: Store persistent data on in-cluster Minio server
+# - swift: Store persistent data in OpenStack Swift storage cluster
 storage = "minio"
 
 # Set the location of Workflow's PostgreSQL database
@@ -60,6 +61,17 @@ registry_bucket = "your-registry-bucket-name"
 database_bucket = "your-database-bucket-name"
 builder_bucket = "your-builder-bucket-name"
 
+[swift]
+username = "Your OpenStack Swift Username"
+password = "Your OpenStack Swift Password"
+authurl = "Swift auth URL for obtaining an auth token"
+# Your OpenStack tenant name if you are using auth version 2 or 3.
+tenant = ""
+authversion = "Your OpenStack swift auth version"
+registry_container = "your-registry-container-name"
+database_container = "your-database-container-name"
+builder_container = "your-builder-container-name"
+
 [builder]
 org = "deisci"
 pullPolicy = "Always"