openstack/devstack
Code Issues Proposed changes

Merge "remove SERVICE_TOKEN from the docs"

Browse Source
This commit is contained in:
Jenkins 2016-01-16 12:29:45 +00:00 committed by Gerrit Code Review
commit a34ebd103d
8 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/source/configuration.rst
View File

@ -108,7 +108,6 @@ values that most often need to be set.
DATABASE_PASSWORD=$ADMIN_PASSWORD
RABBIT_PASSWORD=$ADMIN_PASSWORD
SERVICE_PASSWORD=$ADMIN_PASSWORD
SERVICE_TOKEN=a682f596-76f3-11e3-b3b2-e716f9080d50
#FIXED_RANGE=172.31.1.0/24
#FLOATING_RANGE=192.168.20.0/25
#HOST_IP=10.3.4.5

1
doc/source/guides/devstack-with-lbaas-v2.rst
View File

@ -34,7 +34,6 @@ Edit your ``local.conf`` to look like
DATABASE_PASSWORD=password
ADMIN_PASSWORD=password
SERVICE_PASSWORD=password
SERVICE_TOKEN=password
RABBIT_PASSWORD=password
# Enable Logging
LOGFILE=$DEST/logs/stack.sh.log

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

@ -131,7 +131,6 @@ cluster controller's DevStack in ``local.conf``:
DATABASE_PASSWORD=supersecret
RABBIT_PASSWORD=supersecrete
SERVICE_PASSWORD=supersecrete
SERVICE_TOKEN=xyzpdqlazydog
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
@ -172,7 +171,6 @@ machines, create a ``local.conf`` with:
DATABASE_PASSWORD=supersecret
RABBIT_PASSWORD=supersecrete
SERVICE_PASSWORD=supersecrete
SERVICE_TOKEN=xyzpdqlazydog
DATABASE_TYPE=mysql
SERVICE_HOST=192.168.42.11
MYSQL_HOST=$SERVICE_HOST

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

@ -59,7 +59,6 @@ serving as a hypervisor for guest instances.
DATABASE_PASSWORD=secrete
RABBIT_PASSWORD=secrete
SERVICE_PASSWORD=secrete
SERVICE_TOKEN=secrete
# Do not use Nova-Network
disable_service n-net
@ -231,7 +230,6 @@ The host `devstack-2` has a very minimal `local.conf`.
MYSQL_PASSWORD=secrete
RABBIT_PASSWORD=secrete
SERVICE_PASSWORD=secrete
SERVICE_TOKEN=secrete
## Neutron options
PUBLIC_INTERFACE=eth0
@ -362,7 +360,6 @@ controller node.
MYSQL_PASSWORD=secrete
RABBIT_PASSWORD=secrete
SERVICE_PASSWORD=secrete
SERVICE_TOKEN=secrete
## Neutron options
Q_USE_SECGROUP=True
@ -410,7 +407,6 @@ compute node 1.
MYSQL_PASSWORD=secrete
RABBIT_PASSWORD=secrete
SERVICE_PASSWORD=secrete
SERVICE_TOKEN=secrete
# Services that a compute node runs
ENABLED_SERVICES=n-cpu,rabbit,q-agt

1
doc/source/guides/single-machine.rst
View File

@ -108,7 +108,6 @@ do the following:
DATABASE_PASSWORD=iheartdatabases
RABBIT_PASSWORD=flopsymopsy
SERVICE_PASSWORD=iheartksl
SERVICE_TOKEN=xyzpdqlazydog
Run DevStack:

1
doc/source/guides/single-vm.rst
View File

@ -67,7 +67,6 @@ passed as the user-data file when booting the VM.
echo DATABASE_PASSWORD=password >> local.conf
echo RABBIT_PASSWORD=password >> local.conf
echo SERVICE_PASSWORD=password >> local.conf
echo SERVICE_TOKEN=tokentoken >> local.conf
./stack.sh
path: /home/stack/start.sh
permissions: 0755

2
tools/create_userrc.sh
View File

@ -156,7 +156,7 @@ if [ -z "$MODE" ]; then
exit 3
fi
export -n SERVICE_TOKEN SERVICE_ENDPOINT OS_SERVICE_TOKEN OS_SERVICE_ENDPOINT
export -n SERVICE_ENDPOINT OS_SERVICE_ENDPOINT
EC2_URL=$(openstack endpoint list --service ec2 --interface public --os-identity-api-version=3 -c URL -f value || true)
if [[ -z $EC2_URL ]]; then

1
tools/xen/README.md
View File

@ -78,7 +78,6 @@ Of course, use real passwords if this machine is exposed.
# to prompt for these passwords, blocking the install process.
DATABASE_PASSWORD=my_super_secret
SERVICE_TOKEN=my_super_secret
ADMIN_PASSWORD=my_super_secret
SERVICE_PASSWORD=my_super_secret
RABBIT_PASSWORD=my_super_secret