openstack/octavia
Code Issues Proposed changes

Fixes missing admin/user for devstack plugin

Browse Source 
At some point a VAR we depended on was removed or changed upstream. This
patch updates to fixes that so the users fields are populated again.

Change-Id: Ie58b478d13b758e020df0655e6e3462ab4755f9a
This commit is contained in:
ptoohill1 2015-06-19 12:54:02 -05:00
parent c149ae1cef
commit 180e6a3c8a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/settings
View File

@ -9,12 +9,12 @@ OCTAVIA_CERTS_DIR=${OCTAVIA_CERTS_DIR:-${OCTAVIA_CONF_DIR}/certs}
OCTAVIA_CONF=${OCTAVIA_CONF:-${OCTAVIA_CONF_DIR}/octavia.conf}
OCTAVIA_TEMPEST_DIR=${OCTAVIA_TEMPEST_DIR:-${OCTAVIA_DIR}/octavia/tests/tempest}
OCTAVIA_USER=${OCTAVIA_USER:-${ADMIN_USER}}
OCTAVIA_ADMIN_USER=${OCTAVIA_ADMIN_USER:-"admin"}
OCTAVIA_USER=${OCTAVIA_USER:-${OCTAVIA_ADMIN_USER}}
OCTAVIA_PASSWORD=${OCTAVIA_PASSWORD:-${ADMIN_PASSWORD}}
OCTAVIA_TENANT_ID=${OCTAVIA_TENANT_ID:-${ADMIN_TENANT_ID}}
OCTAVIA_AUTH_VERSION=${OCTAVIA_AUTH_VERSION:-"2"}
OCTAVIA_ADMIN_USER=${OCTAVIA_ADMIN_USER:-${ADMIN_USER}}
OCTAVIA_ADMIN_TENANT_NAME=${OCTAVIA_ADMIN_TENANT_NAME:-${ADMIN_USER}}
OCTAVIA_ADMIN_TENANT_NAME=${OCTAVIA_ADMIN_TENANT_NAME:-${OCTAVIA_ADMIN_USER}}
OCTAVIA_ADMIN_PASSWORD=${OCTAVIA_ADMIN_PASSWORD:-${ADMIN_PASSWORD}}
OCTAVIA_PROTOCOL=${OCTAVIA_PROTOCOL:-"http"}