openstack/devstack
Code Issues Proposed changes

Allow replacing a user variable in a swift template

Browse Source 
Prepare for a change in swift templates that will have a %USER%
variable.

Change-Id: I611ae7f82de7f2e6a38ce3de38d0600fa8687bff
Partial-Bug: 1226346
This commit is contained in:
Jamie Lennox 2013-09-17 11:44:37 +10:00
parent 0b29d86930
commit d582460147
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/swift
View File

@ -132,6 +132,7 @@ function _config_swift_apache_wsgi() {
s/%PORT%/$proxy_port/g; s/%PORT%/$proxy_port/g;
s/%SERVICENAME%/proxy-server/g; s/%SERVICENAME%/proxy-server/g;
s/%APACHE_NAME%/${APACHE_NAME}/g; s/%APACHE_NAME%/${APACHE_NAME}/g;
s/%USER%/${STACK_USER}/g;
" -i ${apache_vhost_dir}/proxy-server " -i ${apache_vhost_dir}/proxy-server
sudo cp ${SWIFT_DIR}/examples/wsgi/proxy-server.wsgi.template ${SWIFT_APACHE_WSGI_DIR}/proxy-server.wsgi sudo cp ${SWIFT_DIR}/examples/wsgi/proxy-server.wsgi.template ${SWIFT_APACHE_WSGI_DIR}/proxy-server.wsgi
@ -152,6 +153,7 @@ function _config_swift_apache_wsgi() {
s/%PORT%/$object_port/g; s/%PORT%/$object_port/g;
s/%SERVICENAME%/object-server-${node_number}/g; s/%SERVICENAME%/object-server-${node_number}/g;
s/%APACHE_NAME%/${APACHE_NAME}/g; s/%APACHE_NAME%/${APACHE_NAME}/g;
s/%USER%/${STACK_USER}/g;
" -i ${apache_vhost_dir}/object-server-${node_number} " -i ${apache_vhost_dir}/object-server-${node_number}
! is_fedora && sudo a2ensite object-server-${node_number} ! is_fedora && sudo a2ensite object-server-${node_number}
@ -167,6 +169,7 @@ function _config_swift_apache_wsgi() {
s/%PORT%/$container_port/g; s/%PORT%/$container_port/g;
s/%SERVICENAME%/container-server-${node_number}/g; s/%SERVICENAME%/container-server-${node_number}/g;
s/%APACHE_NAME%/${APACHE_NAME}/g; s/%APACHE_NAME%/${APACHE_NAME}/g;
s/%USER%/${STACK_USER}/g;
" -i ${apache_vhost_dir}/container-server-${node_number} " -i ${apache_vhost_dir}/container-server-${node_number}
! is_fedora && sudo a2ensite container-server-${node_number} ! is_fedora && sudo a2ensite container-server-${node_number}
@ -182,6 +185,7 @@ function _config_swift_apache_wsgi() {
s/%PORT%/$account_port/g; s/%PORT%/$account_port/g;
s/%SERVICENAME%/account-server-${node_number}/g; s/%SERVICENAME%/account-server-${node_number}/g;
s/%APACHE_NAME%/${APACHE_NAME}/g; s/%APACHE_NAME%/${APACHE_NAME}/g;
s/%USER%/${STACK_USER}/g;
" -i ${apache_vhost_dir}/account-server-${node_number} " -i ${apache_vhost_dir}/account-server-${node_number}
! is_fedora && sudo a2ensite account-server-${node_number} ! is_fedora && sudo a2ensite account-server-${node_number}