Merge "Remove n-crt from default services"
diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst
index e985bdc..0493f8f 100644
--- a/doc/source/configuration.rst
+++ b/doc/source/configuration.rst
@@ -104,7 +104,7 @@
::
[[local|localrc]]
- ADMIN_PASSWORD=secrete
+ ADMIN_PASSWORD=secret
DATABASE_PASSWORD=$ADMIN_PASSWORD
RABBIT_PASSWORD=$ADMIN_PASSWORD
SERVICE_PASSWORD=$ADMIN_PASSWORD
diff --git a/doc/source/guides/multinode-lab.rst b/doc/source/guides/multinode-lab.rst
index 392bb1b..c996f95 100644
--- a/doc/source/guides/multinode-lab.rst
+++ b/doc/source/guides/multinode-lab.rst
@@ -129,8 +129,8 @@
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 @@
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 @@
# 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
diff --git a/doc/source/guides/neutron.rst b/doc/source/guides/neutron.rst
index cac7bb0..4406aa0 100644
--- a/doc/source/guides/neutron.rst
+++ b/doc/source/guides/neutron.rst
@@ -59,10 +59,10 @@
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 @@
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 @@
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 @@
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 @@
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
@@ -537,19 +537,3 @@
PUBLIC_PHYSICAL_NETWORK=default
LB_INTERFACE_MAPPINGS=default:eth0
-Creating specific OVS bridges for physical networks
----------------------------------------------------
-
-When using the Open vSwitch ML2 mechanism driver, it is possible to
-have multiple Open vSwitch bridges meant for physical networking be
-automatically created by setting the ``OVS_BRIDGE_MAPPINGS`` to a list of
-physical network to bridge name associations with the following syntax:
-
-::
-
- OVS_BRIDGE_MAPPINGS=net1name:bridge1name,net2name:bridge2name,<...>
-
-Also, ``OVS_BRIDGE_MAPPINGS`` has precedence over ``PHYSICAL_NETWORK`` and
-``OVS_PHYSICAL_BRIDGE``, meaning that if the former is set, the latter
-ones will be ignored. When ``OVS_BRIDGE_MAPPINGS`` is not set, the other
-variables will still be evaluated.
diff --git a/doc/source/openrc.rst b/doc/source/openrc.rst
index 0b090c7..4e7f075 100644
--- a/doc/source/openrc.rst
+++ b/doc/source/openrc.rst
@@ -35,7 +35,7 @@
::
- OS_PASSWORD=secrete
+ OS_PASSWORD=secret
HOST\_IP, SERVICE\_HOST
Set API endpoint host using ``HOST_IP``. ``SERVICE_HOST`` may also
diff --git a/doc/source/plugin-registry.rst b/doc/source/plugin-registry.rst
index a52eba8..136a9e4 100644
--- a/doc/source/plugin-registry.rst
+++ b/doc/source/plugin-registry.rst
@@ -106,6 +106,8 @@
+----------------------------+-------------------------------------------------------------------------+
|networking-bgpvpn |git://git.openstack.org/openstack/networking-bgpvpn |
+----------------------------+-------------------------------------------------------------------------+
+|networking-brocade |git://git.openstack.org/openstack/networking-brocade |
++----------------------------+-------------------------------------------------------------------------+
|networking-calico |git://git.openstack.org/openstack/networking-calico |
+----------------------------+-------------------------------------------------------------------------+
|networking-cisco |git://git.openstack.org/openstack/networking-cisco |
diff --git a/files/debs/general b/files/debs/general
index 1215147..307cd7b 100644
--- a/files/debs/general
+++ b/files/debs/general
@@ -28,6 +28,7 @@
tar
tcpdump
unzip
+uuid-runtime
wget
wget
zlib1g-dev
diff --git a/files/debs/neutron b/files/debs/neutron
index e53cc68..2307fa5 100644
--- a/files/debs/neutron
+++ b/files/debs/neutron
@@ -13,5 +13,4 @@
radvd # NOPRIME
sqlite3
sudo
-uuid-runtime
vlan
diff --git a/lib/neutron_plugins/openvswitch_agent b/lib/neutron_plugins/openvswitch_agent
index e1c5a50..339d5fd 100644
--- a/lib/neutron_plugins/openvswitch_agent
+++ b/lib/neutron_plugins/openvswitch_agent
@@ -37,7 +37,6 @@
}
function neutron_plugin_configure_plugin_agent {
- local mappings_array mapping phys_bridge
# Setup integration bridge
_neutron_ovs_base_setup_bridge $OVS_BRIDGE
_neutron_ovs_base_configure_firewall_driver
@@ -53,15 +52,9 @@
# complex physical network configurations.
if [[ "$OVS_BRIDGE_MAPPINGS" == "" ]] && [[ "$PHYSICAL_NETWORK" != "" ]] && [[ "$OVS_PHYSICAL_BRIDGE" != "" ]]; then
OVS_BRIDGE_MAPPINGS=$PHYSICAL_NETWORK:$OVS_PHYSICAL_BRIDGE
- fi
- if [[ "$OVS_BRIDGE_MAPPINGS" != "" ]]; then
- IFS=',' read -a mappings_array <<< "$OVS_BRIDGE_MAPPINGS"
- for mapping in "${mappings_array[@]}"; do
- phys_bridge=`echo $mapping | cut -f 2 -d ":"`
- # Configure bridge manually with physical interface as port for multi-node
- _neutron_ovs_base_add_bridge $phys_bridge
- done
+ # Configure bridge manually with physical interface as port for multi-node
+ _neutron_ovs_base_add_bridge $OVS_PHYSICAL_BRIDGE
fi
if [[ "$OVS_BRIDGE_MAPPINGS" != "" ]]; then
iniset /$Q_PLUGIN_CONF_FILE ovs bridge_mappings $OVS_BRIDGE_MAPPINGS
diff --git a/lib/tempest b/lib/tempest
index 3b8a888..19b63d1 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -176,7 +176,7 @@
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}
diff --git a/openrc b/openrc
index 460cf14..db2e97d 100644
--- a/openrc
+++ b/openrc
@@ -51,7 +51,7 @@
# 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.
diff --git a/samples/local.conf b/samples/local.conf
index ea68dc0..06ac185 100644
--- a/samples/local.conf
+++ b/samples/local.conf
@@ -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
diff --git a/tools/xen/xenrc b/tools/xen/xenrc
index be6c5ca..bb27454 100644
--- a/tools/xen/xenrc
+++ b/tools/xen/xenrc
@@ -32,7 +32,7 @@
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