diff options
| author | Peter Stachowski <peter@tesora.com> | 2016-08-16 21:50:46 +0000 |
|---|---|---|
| committer | Amrith Kumar <amrith@amrith.org> | 2016-11-29 09:52:59 -0500 |
| commit | c666032b099838c1584538aa79bdf57036c0a329 (patch) | |
| tree | bfe4b0cd600d398fa4b319cb04349f7af426faa5 /devstack/settings | |
| parent | 731ca1bdfd870a7e5cfe5112c497b1fa0795e863 (diff) | |
| download | trove-c666032b099838c1584538aa79bdf57036c0a329.tar.gz | |
Create net/subnet for alt_demo tenant
Now that devstack uses Neutron by default (and so does the gate)
we need to create a private network and subnet in the alt_demo
tenant for the int-tests to work.
(see https://review.openstack.org/#/c/355492 )
Note that we will not use this network to start as some issues
still need to be sorted out.
The tcp_ports configuration was also moved to facilitate both
network styles.
The 'PUBLIC_INTERFACE=eth0' line was also moved to be in just
nova networking as it is not necessary for Neutron (and caused
the network to become unstable). This should allow it to
continue working for backwards compatibility if required.
A number of changes to code and/or tests were also required.
Since these are specifically tied to the switch to neutron
(as they are equally valid for nova-net) they have been
made separately and referenced below in the 'dependencies' list.
This should also facilitate easier reviews and make it
possible to backport any of the fixes if required.
The cluster tests for PXC and Redis were turned off until the
networking issues with these two datastores can be sorted out.
Merged dependencies: I136141b3db78b7a0a1804bb5e3d4ca5cf4bc3bb3
I47cbe9e899cb0767c377d184f123e38eda5b6a05
I2ede074eb9bdf26420750f19f3aa4b8d057c5d7d
I6aff776680c9c0632d8965c3ed70ed26db0a63f2
I54edc4acac09ca2278f525c08ad0d87576f0549e
Iab530fe503336c83e9b948c2c008d371a8030a1e
I6464c0031ba5b504ff103d8f62093d252deb87bb
We need to have the new variable IPV4_ADDRS_SAFE_TO_USE defined:
Depends-On: Ic6720677a4a496d246a8f9be5ede1a53821f56dc
Change-Id: I5c1714b7839b2736c50f2daa2f4506c4006815a1
Closes-Bug: #1613889
Diffstat (limited to 'devstack/settings')
| -rw-r--r-- | devstack/settings | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/devstack/settings b/devstack/settings index 1fe89543..2a4eb4b4 100644 --- a/devstack/settings +++ b/devstack/settings @@ -42,6 +42,8 @@ TROVE_STATE_CHANGE_WAIT_TIME=${TROVE_STATE_CHANGE_WAIT_TIME} # Set up the host gateway if is_service_enabled neutron; then TROVE_HOST_GATEWAY=${PUBLIC_NETWORK_GATEWAY:-172.24.4.1} + TROVE_PRIVATE_NETWORK_NAME=${TROVE_PRIVATE_NETWORK_NAME:-alt-private} + TROVE_PRIVATE_SUBNET_NAME=${TROVE_PRIVATE_SUBNET_NAME:-${TROVE_PRIVATE_NETWORK_NAME}-subnet} else TROVE_HOST_GATEWAY=${NETWORK_GATEWAY:-10.0.0.1} fi |