Browse code
remove SERVICE_TOKEN from the docs
there are a few lingering instances of SERVICE_TOKEN in the docs
and some of the scripts in tools.
Change-Id: I9d2147eea6639db1f4ea15a259c147eecfc339ff
Steve Martinelli authored on 2016/01/06 11:36:23Showing 8 changed files
- doc/source/configuration.rst
- doc/source/guides/devstack-with-lbaas-v2.rst
- doc/source/guides/multinode-lab.rst
- doc/source/guides/neutron.rst
- doc/source/guides/single-machine.rst
- doc/source/guides/single-vm.rst
- tools/create_userrc.sh
- tools/xen/README.md
| ... | ... |
@@ -108,7 +108,6 @@ values that most often need to be set. |
| 108 | 108 |
DATABASE_PASSWORD=$ADMIN_PASSWORD |
| 109 | 109 |
RABBIT_PASSWORD=$ADMIN_PASSWORD |
| 110 | 110 |
SERVICE_PASSWORD=$ADMIN_PASSWORD |
| 111 |
- SERVICE_TOKEN=a682f596-76f3-11e3-b3b2-e716f9080d50 |
|
| 112 | 111 |
#FIXED_RANGE=172.31.1.0/24 |
| 113 | 112 |
#FLOATING_RANGE=192.168.20.0/25 |
| 114 | 113 |
#HOST_IP=10.3.4.5 |
| ... | ... |
@@ -131,7 +131,6 @@ cluster controller's DevStack in ``local.conf``: |
| 131 | 131 |
DATABASE_PASSWORD=supersecret |
| 132 | 132 |
RABBIT_PASSWORD=supersecrete |
| 133 | 133 |
SERVICE_PASSWORD=supersecrete |
| 134 |
- SERVICE_TOKEN=xyzpdqlazydog |
|
| 135 | 134 |
|
| 136 | 135 |
In the multi-node configuration the first 10 or so IPs in the private |
| 137 | 136 |
subnet are usually reserved. Add this to ``local.sh`` to have it run |
| ... | ... |
@@ -172,7 +171,6 @@ machines, create a ``local.conf`` with: |
| 172 | 172 |
DATABASE_PASSWORD=supersecret |
| 173 | 173 |
RABBIT_PASSWORD=supersecrete |
| 174 | 174 |
SERVICE_PASSWORD=supersecrete |
| 175 |
- SERVICE_TOKEN=xyzpdqlazydog |
|
| 176 | 175 |
DATABASE_TYPE=mysql |
| 177 | 176 |
SERVICE_HOST=192.168.42.11 |
| 178 | 177 |
MYSQL_HOST=$SERVICE_HOST |
| ... | ... |
@@ -59,7 +59,6 @@ serving as a hypervisor for guest instances. |
| 59 | 59 |
DATABASE_PASSWORD=secrete |
| 60 | 60 |
RABBIT_PASSWORD=secrete |
| 61 | 61 |
SERVICE_PASSWORD=secrete |
| 62 |
- SERVICE_TOKEN=secrete |
|
| 63 | 62 |
|
| 64 | 63 |
# Do not use Nova-Network |
| 65 | 64 |
disable_service n-net |
| ... | ... |
@@ -231,7 +230,6 @@ The host `devstack-2` has a very minimal `local.conf`. |
| 231 | 231 |
MYSQL_PASSWORD=secrete |
| 232 | 232 |
RABBIT_PASSWORD=secrete |
| 233 | 233 |
SERVICE_PASSWORD=secrete |
| 234 |
- SERVICE_TOKEN=secrete |
|
| 235 | 234 |
|
| 236 | 235 |
## Neutron options |
| 237 | 236 |
PUBLIC_INTERFACE=eth0 |
| ... | ... |
@@ -362,7 +360,6 @@ controller node. |
| 362 | 362 |
MYSQL_PASSWORD=secrete |
| 363 | 363 |
RABBIT_PASSWORD=secrete |
| 364 | 364 |
SERVICE_PASSWORD=secrete |
| 365 |
- SERVICE_TOKEN=secrete |
|
| 366 | 365 |
|
| 367 | 366 |
## Neutron options |
| 368 | 367 |
Q_USE_SECGROUP=True |
| ... | ... |
@@ -410,7 +407,6 @@ compute node 1. |
| 410 | 410 |
MYSQL_PASSWORD=secrete |
| 411 | 411 |
RABBIT_PASSWORD=secrete |
| 412 | 412 |
SERVICE_PASSWORD=secrete |
| 413 |
- SERVICE_TOKEN=secrete |
|
| 414 | 413 |
|
| 415 | 414 |
# Services that a compute node runs |
| 416 | 415 |
ENABLED_SERVICES=n-cpu,rabbit,q-agt |
| ... | ... |
@@ -67,7 +67,6 @@ passed as the user-data file when booting the VM. |
| 67 | 67 |
echo DATABASE_PASSWORD=password >> local.conf |
| 68 | 68 |
echo RABBIT_PASSWORD=password >> local.conf |
| 69 | 69 |
echo SERVICE_PASSWORD=password >> local.conf |
| 70 |
- echo SERVICE_TOKEN=tokentoken >> local.conf |
|
| 71 | 70 |
./stack.sh |
| 72 | 71 |
path: /home/stack/start.sh |
| 73 | 72 |
permissions: 0755 |
| ... | ... |
@@ -156,7 +156,7 @@ if [ -z "$MODE" ]; then |
| 156 | 156 |
exit 3 |
| 157 | 157 |
fi |
| 158 | 158 |
|
| 159 |
-export -n SERVICE_TOKEN SERVICE_ENDPOINT OS_SERVICE_TOKEN OS_SERVICE_ENDPOINT |
|
| 159 |
+export -n SERVICE_ENDPOINT OS_SERVICE_ENDPOINT |
|
| 160 | 160 |
|
| 161 | 161 |
EC2_URL=$(openstack endpoint list --service ec2 --interface public --os-identity-api-version=3 -c URL -f value || true) |
| 162 | 162 |
if [[ -z $EC2_URL ]]; then |
| ... | ... |
@@ -78,7 +78,6 @@ Of course, use real passwords if this machine is exposed. |
| 78 | 78 |
# to prompt for these passwords, blocking the install process. |
| 79 | 79 |
|
| 80 | 80 |
DATABASE_PASSWORD=my_super_secret |
| 81 |
- SERVICE_TOKEN=my_super_secret |
|
| 82 | 81 |
ADMIN_PASSWORD=my_super_secret |
| 83 | 82 |
SERVICE_PASSWORD=my_super_secret |
| 84 | 83 |
RABBIT_PASSWORD=my_super_secret |