X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=ansible%2Froles%2Fswift%2Ftemplates%2Fmain%2Fproxy-server.conf;h=b4789af02ccd8ddf913034913bd25911edc9dcdf;hb=e7699d4abe5bbbf605b5e7278bef0e76e8ebe05f;hp=98baa3db1a70fce61e51b59672aef1534502c771;hpb=2ed671c54dad28dd81763928b28cd17d5c76df66;p=ta%2Fcaas-registry.git

diff --git a/ansible/roles/swift/templates/main/proxy-server.conf b/ansible/roles/swift/templates/main/proxy-server.conf
index 98baa3d..b4789af 100644
--- a/ansible/roles/swift/templates/main/proxy-server.conf
+++ b/ansible/roles/swift/templates/main/proxy-server.conf
@@ -1,3 +1,4 @@
+#jinja2:trim_blocks:False
 {#
 Copyright 2019 Nokia
 
@@ -16,7 +17,7 @@ limitations under the License.
 [DEFAULT]
 bind_ip = 127.0.0.1
 bind_port = 18084
-workers = 4 
+workers = 4
 user = swift
 
 [pipeline:main]
@@ -47,5 +48,4 @@ use = egg:swift#healthcheck
 storage_url_scheme = https
 use = egg:swift#tempauth
 # user_<tenant>_<username> = <password> <privileges>
-user_admin_admin = {{ swift_admin_pass }} .admin .reseller_admin
-user_admin_registry = {{ swift_registry_pass }} .admin
+user_admin_admin = {{ caas.swift_credential.password }} .admin .reseller_admin