openstack/openstack-ansible
Code Issues Proposed changes

Merge "Set default pass in aio scripts to be random"

Browse Source
This commit is contained in:
Jenkins 2015-06-16 10:39:02 +00:00 committed by Gerrit Code Review
commit 1e7d433d98
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/bootstrap-aio.sh
View File

@ -19,7 +19,8 @@ set -e -u -x
## Vars ----------------------------------------------------------------------
export ADMIN_PASSWORD=${ADMIN_PASSWORD:-"secrete"}
DEFAULT_PASSWORD=$(head -c 64 /dev/urandom | tr -dc 'a-zA-Z0-9')
export ADMIN_PASSWORD=${ADMIN_PASSWORD:-$DEFAULT_PASSWORD}
export SERVICE_REGION=${SERVICE_REGION:-"RegionOne"}
export DEPLOY_SWIFT=${DEPLOY_SWIFT:-"yes"}
export GET_PIP_URL=${GET_PIP_URL:-"https://bootstrap.pypa.io/get-pip.py"}

4
scripts/osad-aio-heat-template.yml
View File

@ -56,8 +56,10 @@ outputs:
value: { get_attr: [ OSADAIO, first_address ] }
OSADAIO_password:
description: The password for all the things.
value: secrete
value: { get_attr: [ OSADAIO_random_pass, value ] }
resources:
OSADAIO_random_pass:
type: OS::Heat::RandomString
OSADAIO_port:
type: OS::Neutron::Port
properties: