@@ -104,7 +104,7 @@ values that most often need to be set.

 ::

     [[local|localrc]]

-    ADMIN_PASSWORD=secrete

+    ADMIN_PASSWORD=secret

     DATABASE_PASSWORD=$ADMIN_PASSWORD

     RABBIT_PASSWORD=$ADMIN_PASSWORD

     SERVICE_PASSWORD=$ADMIN_PASSWORD

@@ -129,8 +129,8 @@ cluster controller's DevStack in ``local.conf``:

     LOGFILE=/opt/stack/logs/stack.sh.log

     ADMIN_PASSWORD=labstack

     DATABASE_PASSWORD=supersecret

-    RABBIT_PASSWORD=supersecrete

-    SERVICE_PASSWORD=supersecrete

+    RABBIT_PASSWORD=supersecret

+    SERVICE_PASSWORD=supersecret

 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

@@ -169,8 +169,8 @@ machines, create a ``local.conf`` with:

     LOGFILE=/opt/stack/logs/stack.sh.log

     ADMIN_PASSWORD=labstack

     DATABASE_PASSWORD=supersecret

-    RABBIT_PASSWORD=supersecrete

-    SERVICE_PASSWORD=supersecrete

+    RABBIT_PASSWORD=supersecret

+    SERVICE_PASSWORD=supersecret

     DATABASE_TYPE=mysql

     SERVICE_HOST=192.168.42.11

     MYSQL_HOST=$SERVICE_HOST

@@ -254,7 +254,7 @@ for scripting:

     # Add a user and project

     NAME=bob

-    PASSWORD=BigSecrete

+    PASSWORD=BigSecret

     PROJECT=$NAME

     openstack project create $PROJECT

     openstack user create $NAME --password=$PASSWORD --project $PROJECT

@@ -59,10 +59,10 @@ serving as a hypervisor for guest instances.

         MYSQL_HOST=172.18.161.6

         RABBIT_HOST=172.18.161.6

         GLANCE_HOSTPORT=172.18.161.6:9292

-        ADMIN_PASSWORD=secrete

-        DATABASE_PASSWORD=secrete

-        RABBIT_PASSWORD=secrete

-        SERVICE_PASSWORD=secrete

+        ADMIN_PASSWORD=secret

+        DATABASE_PASSWORD=secret

+        RABBIT_PASSWORD=secret

+        SERVICE_PASSWORD=secret

         # Do not use Nova-Network

         disable_service n-net

@@ -232,10 +232,10 @@ The host `devstack-2` has a very minimal `local.conf`.

     MYSQL_HOST=172.18.161.6

     RABBIT_HOST=172.18.161.6

     GLANCE_HOSTPORT=172.18.161.6:9292

-    ADMIN_PASSWORD=secrete

-    MYSQL_PASSWORD=secrete

-    RABBIT_PASSWORD=secrete

-    SERVICE_PASSWORD=secrete

+    ADMIN_PASSWORD=secret

+    MYSQL_PASSWORD=secret

+    RABBIT_PASSWORD=secret

+    SERVICE_PASSWORD=secret

     ## Neutron options

     PUBLIC_INTERFACE=eth0

@@ -362,10 +362,10 @@ controller node.

         GLANCE_HOSTPORT=10.0.0.2:9292

         PUBLIC_INTERFACE=eth1

-        ADMIN_PASSWORD=secrete

-        MYSQL_PASSWORD=secrete

-        RABBIT_PASSWORD=secrete

-        SERVICE_PASSWORD=secrete

+        ADMIN_PASSWORD=secret

+        MYSQL_PASSWORD=secret

+        RABBIT_PASSWORD=secret

+        SERVICE_PASSWORD=secret

         ## Neutron options

         Q_USE_SECGROUP=True

@@ -409,10 +409,10 @@ compute node 1.

         MYSQL_HOST=10.0.0.2

         RABBIT_HOST=10.0.0.2

         GLANCE_HOSTPORT=10.0.0.2:9292

-        ADMIN_PASSWORD=secrete

-        MYSQL_PASSWORD=secrete

-        RABBIT_PASSWORD=secrete

-        SERVICE_PASSWORD=secrete

+        ADMIN_PASSWORD=secret

+        MYSQL_PASSWORD=secret

+        RABBIT_PASSWORD=secret

+        SERVICE_PASSWORD=secret

         # Services that a compute node runs

         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

     RABBIT_HOST=172.18.161.6

     GLANCE_HOSTPORT=172.18.161.6:9292

-    ADMIN_PASSWORD=secrete

-    DATABASE_PASSWORD=secrete

-    RABBIT_PASSWORD=secrete

-    SERVICE_PASSWORD=secrete

+    ADMIN_PASSWORD=secret

+    DATABASE_PASSWORD=secret

+    RABBIT_PASSWORD=secret

+    SERVICE_PASSWORD=secret

     # Do not use Nova-Network

     disable_service n-net

@@ -35,7 +35,7 @@ OS\_PASSWORD

     ::

-        OS_PASSWORD=secrete

+        OS_PASSWORD=secret

 HOST\_IP, SERVICE\_HOST

     Set API endpoint host using ``HOST_IP``. ``SERVICE_HOST`` may also

@@ -176,7 +176,7 @@ function configure_tempest {

     sudo install -d -o $STACK_USER $TEMPEST_CONFIG_DIR

     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

     local admin_username=${ADMIN_USERNAME:-admin}

@@ -51,7 +51,7 @@ export OS_USERNAME=${OS_USERNAME:-demo}

 # With Keystone you pass the keystone password instead of an api key.

 # Recent versions of novaclient use OS_PASSWORD instead of NOVA_API_KEYs

 # 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

 # easier with this off.

@@ -25,7 +25,7 @@

 # 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``.

-ADMIN_PASSWORD=nomoresecrete

+ADMIN_PASSWORD=nomoresecret

 DATABASE_PASSWORD=stackdb

 RABBIT_PASSWORD=stackqueue

 SERVICE_PASSWORD=$ADMIN_PASSWORD

@@ -32,7 +32,7 @@ PUB_BRIDGE_OR_NET_NAME="OpenStack Public Network"

 XEN_INT_BRIDGE_OR_NET_NAME="OpenStack VM Integration Network"

 # VM Password

-GUEST_PASSWORD=${GUEST_PASSWORD:-secrete}

+GUEST_PASSWORD=${GUEST_PASSWORD:-secret}

 # Extracted variables for OpenStack VM network device numbers.

 # Make sure they form a continuous sequence starting from 0