Move swift authentication data to cm

[ta/caas-registry.git] / ansible / roles / swift / templates / main / proxy-server.conf

diff --git a/ansible/roles/swift/templates/main/proxy-server.conf b/ansible/roles/swift/templates/main/proxy-server.conf
index 98baa3d..1954c21 100644 (file)
--- 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,5 @@ 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_admin = {{ caas.swift_credential.password }} .admin .reseller_admin
 user_admin_registry = {{ swift_registry_pass }} .admin