openstack
/
manila
Code Issues Proposed changes

Merge "Added to devstack plugin passwords for services"

This commit is contained in:
Jenkins 2014-02-18 11:27:34 +00:00 committed by Gerrit Code Review
parent 9d163f2c41 e9d14b4aa1
commit e0efa6e563
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/devstack/lib/manila
View File

@ -189,6 +189,10 @@ function configure_manila() {
iniset $MANILA_CONF DEFAULT share_lvm_helpers CIFS=$CIFS_HELPER,NFS=manila.share.drivers.lvm.NFSHelper
iniset $MANILA_CONF DEFAULT path_to_key /home/stack/.ssh/id_rsa.pub
iniset $MANILA_CONF DEFAULT nova_admin_password $SERVICE_PASSWORD
iniset $MANILA_CONF DEFAULT cinder_admin_password $SERVICE_PASSWORD
iniset $MANILA_CONF DEFAULT neutron_admin_password $SERVICE_PASSWORD
if is_service_enabled tls-proxy; then
# Set the service port for a proxy to take the original
iniset $MANILA_CONF DEFAULT osapi_share_listen_port $MANILA_SERVICE_PORT_INT