Code Review
/
ta
/
caas-registry.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
registry + swift CN added
[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
def7cf0
..
b4789af
100644
(file)
--- a/
ansible/roles/swift/templates/main/proxy-server.conf
+++ b/
ansible/roles/swift/templates/main/proxy-server.conf
@@
-17,7
+17,7
@@
limitations under the License.
[DEFAULT]
bind_ip = 127.0.0.1
bind_port = 18084
[DEFAULT]
bind_ip = 127.0.0.1
bind_port = 18084
-workers = 4
+workers = 4
user = swift
[pipeline:main]
user = swift
[pipeline:main]
@@
-48,5
+48,4
@@
use = egg:swift#healthcheck
storage_url_scheme = https
use = egg:swift#tempauth
# user_<tenant>_<username> = <password> <privileges>
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