From 3567d6103abab8484c40f1a46f2465d0931dfbb0 Mon Sep 17 00:00:00 2001 From: Steve Martinelli Date: Tue, 5 Jan 2016 21:36:23 -0500 Subject: [PATCH] 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 --- doc/source/configuration.rst | 1 - doc/source/guides/devstack-with-lbaas-v2.rst | 1 - doc/source/guides/multinode-lab.rst | 2 -- doc/source/guides/neutron.rst | 4 ---- doc/source/guides/single-machine.rst | 1 - doc/source/guides/single-vm.rst | 1 - tools/create_userrc.sh | 2 +- tools/xen/README.md | 1 - 8 files changed, 1 insertion(+), 12 deletions(-) diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst index 386fbbbf71..a7d3b7d9be 100644 --- a/doc/source/configuration.rst +++ b/doc/source/configuration.rst @@ -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 diff --git a/doc/source/guides/devstack-with-lbaas-v2.rst b/doc/source/guides/devstack-with-lbaas-v2.rst index f3bd2feb45..f6379fe43a 100644 --- a/doc/source/guides/devstack-with-lbaas-v2.rst +++ b/doc/source/guides/devstack-with-lbaas-v2.rst @@ -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 diff --git a/doc/source/guides/multinode-lab.rst b/doc/source/guides/multinode-lab.rst index 5660bc5222..37c8515e86 100644 --- a/doc/source/guides/multinode-lab.rst +++ b/doc/source/guides/multinode-lab.rst @@ -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 diff --git a/doc/source/guides/neutron.rst b/doc/source/guides/neutron.rst index a72b6f94cb..84295a50ce 100644 --- a/doc/source/guides/neutron.rst +++ b/doc/source/guides/neutron.rst @@ -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 diff --git a/doc/source/guides/single-machine.rst b/doc/source/guides/single-machine.rst index a01c368213..011c41fbce 100644 --- a/doc/source/guides/single-machine.rst +++ b/doc/source/guides/single-machine.rst @@ -108,7 +108,6 @@ do the following: DATABASE_PASSWORD=iheartdatabases RABBIT_PASSWORD=flopsymopsy SERVICE_PASSWORD=iheartksl - SERVICE_TOKEN=xyzpdqlazydog Run DevStack: diff --git a/doc/source/guides/single-vm.rst b/doc/source/guides/single-vm.rst index 53c3fa973f..45b8f2dd89 100644 --- a/doc/source/guides/single-vm.rst +++ b/doc/source/guides/single-vm.rst @@ -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 diff --git a/tools/create_userrc.sh b/tools/create_userrc.sh index 25f713ca93..93d5d69342 100755 --- a/tools/create_userrc.sh +++ b/tools/create_userrc.sh @@ -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 diff --git a/tools/xen/README.md b/tools/xen/README.md index a1adf590a6..21090e56aa 100644 --- a/tools/xen/README.md +++ b/tools/xen/README.md @@ -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