openstack/devstack
Code Issues Proposed changes

Merge "Change "secrete" to "secret""

Browse Source
This commit is contained in:
Jenkins 2016-03-17 07:19:56 +00:00 committed by Gerrit Code Review
commit aeb1e4d4bb
8 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/configuration.rst
View File

@ -104,7 +104,7 @@ values that most often need to be set.
:: ::
[[local|localrc]] [[local|localrc]]
ADMIN_PASSWORD=secrete ADMIN_PASSWORD=secret
DATABASE_PASSWORD=$ADMIN_PASSWORD DATABASE_PASSWORD=$ADMIN_PASSWORD
RABBIT_PASSWORD=$ADMIN_PASSWORD RABBIT_PASSWORD=$ADMIN_PASSWORD
SERVICE_PASSWORD=$ADMIN_PASSWORD SERVICE_PASSWORD=$ADMIN_PASSWORD

10
doc/source/guides/multinode-lab.rst
View File

@ -129,8 +129,8 @@ cluster controller's DevStack in ``local.conf``:
LOGFILE=/opt/stack/logs/stack.sh.log LOGFILE=/opt/stack/logs/stack.sh.log
ADMIN_PASSWORD=labstack ADMIN_PASSWORD=labstack
DATABASE_PASSWORD=supersecret DATABASE_PASSWORD=supersecret
RABBIT_PASSWORD=supersecrete RABBIT_PASSWORD=supersecret
SERVICE_PASSWORD=supersecrete SERVICE_PASSWORD=supersecret
In the multi-node configuration the first 10 or so IPs in the private In the multi-node configuration the first 10 or so IPs in the private
subnet are usually reserved. Add this to ``local.sh`` to have it run subnet are usually reserved. Add this to ``local.sh`` to have it run
@ -169,8 +169,8 @@ machines, create a ``local.conf`` with:
LOGFILE=/opt/stack/logs/stack.sh.log LOGFILE=/opt/stack/logs/stack.sh.log
ADMIN_PASSWORD=labstack ADMIN_PASSWORD=labstack
DATABASE_PASSWORD=supersecret DATABASE_PASSWORD=supersecret
RABBIT_PASSWORD=supersecrete RABBIT_PASSWORD=supersecret
SERVICE_PASSWORD=supersecrete SERVICE_PASSWORD=supersecret
DATABASE_TYPE=mysql DATABASE_TYPE=mysql
SERVICE_HOST=192.168.42.11 SERVICE_HOST=192.168.42.11
MYSQL_HOST=$SERVICE_HOST MYSQL_HOST=$SERVICE_HOST
@ -254,7 +254,7 @@ for scripting:
# Add a user and project # Add a user and project
NAME=bob NAME=bob
PASSWORD=BigSecrete PASSWORD=BigSecret
PROJECT=$NAME PROJECT=$NAME
openstack project create $PROJECT openstack project create $PROJECT
openstack user create $NAME --password=$PASSWORD --project $PROJECT openstack user create $NAME --password=$PASSWORD --project $PROJECT

40
doc/source/guides/neutron.rst
View File

@ -59,10 +59,10 @@ serving as a hypervisor for guest instances.
MYSQL_HOST=172.18.161.6 MYSQL_HOST=172.18.161.6
RABBIT_HOST=172.18.161.6 RABBIT_HOST=172.18.161.6
GLANCE_HOSTPORT=172.18.161.6:9292 GLANCE_HOSTPORT=172.18.161.6:9292
ADMIN_PASSWORD=secrete ADMIN_PASSWORD=secret
DATABASE_PASSWORD=secrete DATABASE_PASSWORD=secret
RABBIT_PASSWORD=secrete RABBIT_PASSWORD=secret
SERVICE_PASSWORD=secrete SERVICE_PASSWORD=secret
# Do not use Nova-Network # Do not use Nova-Network
disable_service n-net disable_service n-net
@ -232,10 +232,10 @@ The host `devstack-2` has a very minimal `local.conf`.
MYSQL_HOST=172.18.161.6 MYSQL_HOST=172.18.161.6
RABBIT_HOST=172.18.161.6 RABBIT_HOST=172.18.161.6
GLANCE_HOSTPORT=172.18.161.6:9292 GLANCE_HOSTPORT=172.18.161.6:9292
ADMIN_PASSWORD=secrete ADMIN_PASSWORD=secret
MYSQL_PASSWORD=secrete MYSQL_PASSWORD=secret
RABBIT_PASSWORD=secrete RABBIT_PASSWORD=secret
SERVICE_PASSWORD=secrete SERVICE_PASSWORD=secret
## Neutron options ## Neutron options
PUBLIC_INTERFACE=eth0 PUBLIC_INTERFACE=eth0
@ -362,10 +362,10 @@ controller node.
GLANCE_HOSTPORT=10.0.0.2:9292 GLANCE_HOSTPORT=10.0.0.2:9292
PUBLIC_INTERFACE=eth1 PUBLIC_INTERFACE=eth1
ADMIN_PASSWORD=secrete ADMIN_PASSWORD=secret
MYSQL_PASSWORD=secrete MYSQL_PASSWORD=secret
RABBIT_PASSWORD=secrete RABBIT_PASSWORD=secret
SERVICE_PASSWORD=secrete SERVICE_PASSWORD=secret
## Neutron options ## Neutron options
Q_USE_SECGROUP=True Q_USE_SECGROUP=True
@ -409,10 +409,10 @@ compute node 1.
MYSQL_HOST=10.0.0.2 MYSQL_HOST=10.0.0.2
RABBIT_HOST=10.0.0.2 RABBIT_HOST=10.0.0.2
GLANCE_HOSTPORT=10.0.0.2:9292 GLANCE_HOSTPORT=10.0.0.2:9292
ADMIN_PASSWORD=secrete ADMIN_PASSWORD=secret
MYSQL_PASSWORD=secrete MYSQL_PASSWORD=secret
RABBIT_PASSWORD=secrete RABBIT_PASSWORD=secret
SERVICE_PASSWORD=secrete SERVICE_PASSWORD=secret
# Services that a compute node runs # Services that a compute node runs
ENABLED_SERVICES=n-cpu,rabbit,q-agt ENABLED_SERVICES=n-cpu,rabbit,q-agt
@ -509,10 +509,10 @@ setup, with small modifications for the interface mappings.
MYSQL_HOST=172.18.161.6 MYSQL_HOST=172.18.161.6
RABBIT_HOST=172.18.161.6 RABBIT_HOST=172.18.161.6
GLANCE_HOSTPORT=172.18.161.6:9292 GLANCE_HOSTPORT=172.18.161.6:9292
ADMIN_PASSWORD=secrete ADMIN_PASSWORD=secret
DATABASE_PASSWORD=secrete DATABASE_PASSWORD=secret
RABBIT_PASSWORD=secrete RABBIT_PASSWORD=secret
SERVICE_PASSWORD=secrete SERVICE_PASSWORD=secret
# Do not use Nova-Network # Do not use Nova-Network
disable_service n-net disable_service n-net

2
doc/source/openrc.rst
View File

@ -35,7 +35,7 @@ OS\_PASSWORD
:: ::
OS_PASSWORD=secrete OS_PASSWORD=secret
HOST\_IP, SERVICE\_HOST HOST\_IP, SERVICE\_HOST
Set API endpoint host using ``HOST_IP``. ``SERVICE_HOST`` may also Set API endpoint host using ``HOST_IP``. ``SERVICE_HOST`` may also

2
lib/tempest
View File

@ -176,7 +176,7 @@ function configure_tempest {
sudo install -d -o $STACK_USER $TEMPEST_CONFIG_DIR sudo install -d -o $STACK_USER $TEMPEST_CONFIG_DIR
rm -f $TEMPEST_CONFIG rm -f $TEMPEST_CONFIG
local password=${ADMIN_PASSWORD:-secrete} local password=${ADMIN_PASSWORD:-secret}
# See ``lib/keystone`` where these users and tenants are set up # See ``lib/keystone`` where these users and tenants are set up
local admin_username=${ADMIN_USERNAME:-admin} local admin_username=${ADMIN_USERNAME:-admin}

2
openrc
View File

@ -51,7 +51,7 @@ export OS_USERNAME=${OS_USERNAME:-demo}
# With Keystone you pass the keystone password instead of an api key. # With Keystone you pass the keystone password instead of an api key.
# Recent versions of novaclient use OS_PASSWORD instead of NOVA_API_KEYs # Recent versions of novaclient use OS_PASSWORD instead of NOVA_API_KEYs
# or NOVA_PASSWORD. # or NOVA_PASSWORD.
export OS_PASSWORD=${ADMIN_PASSWORD:-secrete} export OS_PASSWORD=${ADMIN_PASSWORD:-secret}
# Don't put the key into a keyring by default. Testing for development is much # Don't put the key into a keyring by default. Testing for development is much
# easier with this off. # easier with this off.

2
samples/local.conf
View File

@ -25,7 +25,7 @@
# If the ``*_PASSWORD`` variables are not set here you will be prompted to enter # If the ``*_PASSWORD`` variables are not set here you will be prompted to enter
# values for them by ``stack.sh``and they will be added to ``local.conf``. # values for them by ``stack.sh``and they will be added to ``local.conf``.
ADMIN_PASSWORD=nomoresecrete ADMIN_PASSWORD=nomoresecret
DATABASE_PASSWORD=stackdb DATABASE_PASSWORD=stackdb
RABBIT_PASSWORD=stackqueue RABBIT_PASSWORD=stackqueue
SERVICE_PASSWORD=$ADMIN_PASSWORD SERVICE_PASSWORD=$ADMIN_PASSWORD

2
tools/xen/xenrc
View File

@ -32,7 +32,7 @@ PUB_BRIDGE_OR_NET_NAME="OpenStack Public Network"
XEN_INT_BRIDGE_OR_NET_NAME="OpenStack VM Integration Network" XEN_INT_BRIDGE_OR_NET_NAME="OpenStack VM Integration Network"
# VM Password # VM Password
GUEST_PASSWORD=${GUEST_PASSWORD:-secrete} GUEST_PASSWORD=${GUEST_PASSWORD:-secret}
# Extracted variables for OpenStack VM network device numbers. # Extracted variables for OpenStack VM network device numbers.
# Make sure they form a continuous sequence starting from 0 # Make sure they form a continuous sequence starting from 0