121 Commits

Author SHA1 Message Date
Jenkins
464d48ab32 Merge "Update deprecated service_neutron_metadata_proxy variable" 2014-08-26 14:59:02 +00:00
Jenkins
ddcde92e90 Merge "Centralize neutron config file argument generation" 2014-08-25 21:59:50 +00:00
Jenkins
3c24a21c5b Merge "Allow to use flat providernet for public network" 2014-08-13 23:17:06 +00:00
Jenkins
629ba0630e Merge "Disable in-band control for PUBLIC_BRIDGE" 2014-08-13 21:47:25 +00:00
Gary Kotton
dd74550581 Update deprecated service_neutron_metadata_proxy variable
Commit c2697f8735a38fb05d54ff4f82110829ead85ee9 moved
service_neutron_metadata_proxy to the neutron section.

Change-Id: I08cdaae9bded1797c663d1bfeaae61535ce64099
2014-08-11 23:40:53 -07:00
Adam Gandelman
7614d21fe1 Centralize neutron config file argument generation
Moves dynamic generation of the --config-file list from local functions
to global utility functions.  This breaks up the current non-obvious
dependency between start_neutron_agents and _configure_neutron_l3_agent
for setting the correct arguments for the vpn agent.   This also similarly
updates generation of arguments for neutron-server and neutron-l3-agent to
use said functions.  Finally, this cleans lib/neutron up a bit and moves
all default paths to config files and binaries out of local functions and
into the top-level, allowing external tools like Grenade to make use of the
library for starting Neutron services and agents currently.

Change-Id: I927dafca8a2047d6c0fd3c74569ed2521f124547
Closes-bug: #1355429
2014-08-11 14:45:22 -07:00
Jenkins
4407315ae9 Merge "Support Router Advertisement Daemon (radvd) for IPv6" 2014-08-07 15:05:37 +00:00
Jenkins
a0c6d1e954 Merge "vxlan default ml2 tenant network type" 2014-08-02 02:09:52 +00:00
Robert Li
72b3e448af Support Router Advertisement Daemon (radvd) for IPv6
Install radvd if the l3 service is enabled.

Partially implements blueprint: neutron-ipv6-radvd-ra

Change-Id: I749b31dcaad072a35e5921579b50f1ca451b1383
2014-08-01 16:10:01 -04:00
YAMAMOTO Takashi
6a633fd024 Allow to use flat providernet for public network
The support of ancillary bridges (aka br-ex) is planned to be
dropped for ofagent.  This commit prepares the deprecation by
providing devstack support for an alternative way to connect
public network.

Related to blueprint ofagent-port-monitor
Change-Id: I6c2ce646070db0ed248665216071499a9b5567ab
2014-08-01 14:26:28 +09:00
YAMAMOTO Takashi
ea3dac9a3c Disable in-band control for PUBLIC_BRIDGE
By default, Open vSwitch installs internal flows for in-band control
to bridges with controller setting.  "with controller setting" part
is false for openvswitch agent but can be true for ofagent.
Unfortunately the internal flows are incompatible with our use of
the local port here to communicate with neutron router.  This commit
avoids the problem by disabling the in-band control functionality.

Related to blueprint ofagent-port-monitor
Change-Id: Ia79d12da3c2224366425be5f6927859181e18909
2014-08-01 11:33:56 +09:00
Jenkins
307cfcb9d1 Merge "neutron: set connection string in neutron.conf" 2014-07-31 11:05:07 +00:00
Jenkins
2f48395054 Merge "Use Q_PORT variable rather than hardcoded port" 2014-07-31 01:05:52 +00:00
Attila Fazekas
8feaf6c951 vxlan default ml2 tenant network type
ovs vxlan become supported on most distribution and provides
isolated `multi tenant` networking without special `vlan` aware switch.

In single node deployment you will just see the br-tun ovs bridge
created.

In multi-node setup you might need to adjust the MTU settings.

If your physical switch supports >=1550 MTU size
 probably you will not see any issue.

If your guest image honors the MTU size offered via dhcp,
you can adjust your dnsmask settings with the correct (likely 1450 byte)
MTU size.

cirros (udhcp) does not honors these setting, you might need to
set lower MTU size on br-ex and/or adjust network_device_mtu option
in your local.conf.

The default changed, because it will be used with the multi-node neutron
jobs.

If you want the original behavior for whatever reason add these to your
`local.conf`:
ENABLE_TENANT_TUNNELS=False
Q_ML2_TENANT_NETWORK_TYPE=local

Change-Id: Id33ff0eca44905b3996618f1035ad984a6819b5b
2014-07-30 11:36:44 +02:00
Ihar Hrachyshka
b816e5d2a0 neutron: set connection string in neutron.conf
it's not recommended to put the connection string in plugin specific
config file [1].

[1]:
https://github.com/openstack/neutron/blob/master/etc/neutron.conf#L534

Change-Id: I3c9d7fe3d34385185f483b509dadf7e2ba920a45
2014-07-29 13:24:48 +02:00
Christian Berendt
f6f42c6a64 Remove configuration parameter Q_DHCP_EXTRA_DEFAULT_OPTS
According to the comments in stack.sh the configuration parameter
Q_DHCP_EXTRA_DEFAULT_OPTS should be removed during the Juno cycle.

Change-Id: I3b38ff57f00e93e6d9692f516291f7129584bc74
2014-07-26 21:54:18 +02:00
Jenkins
fdcb410034 Merge "Remove configuration parameter Q_SRV_EXTRA_DEFAULT_OPTS" 2014-07-26 19:44:51 +00:00
Jenkins
368c45467b Merge "Use one name for neutron database after healing" 2014-07-26 19:38:10 +00:00
Aaron Rosen
186119c39e Use Q_PORT variable rather than hardcoded port
Change-Id: I647c6bdf14f2551bd120821a16044cec2b03b197
closes-bug: 1348834
2014-07-25 15:36:26 -07:00
Christian Berendt
a5b70a1082 Remove configuration parameter Q_SRV_EXTRA_DEFAULT_OPTS
According to the comments in stack.sh the configuration parameter
Q_SRV_EXTRA_DEFAULT_OPTS should be removed during the Juno cycle.

Change-Id: I2a00c924cd51dab00b56cdab1e48e32ffa007de4
2014-07-24 12:50:48 +02:00
Jenkins
dbcffa7497 Merge "Add DVR support to DevStack" 2014-07-24 09:59:06 +00:00
Gael Chamoulaud
6dd8a8bee4 Users in service group should not have email addresses
Change-Id: Ieed9dffce5cf1e735e482dd3494ac1e103b50955
Closes-Bug: 1185201
Signed-off-by: Gael Chamoulaud <gchamoul@redhat.com>
2014-07-22 17:29:04 +02:00
Henry Gessau
0fc1cc29ac Use one name for neutron database after healing
Now that the Neutron database is healed we no longer need a
plugin-specific name for it.

Related Blueprint: db-migration-refactor

Change-Id: If25e77444f115817e5570bb447bde5b9c8d6e686
2014-07-15 21:29:29 -04:00
Jenkins
df2cc34db6 Merge "Fix Neutron configuration if Ceilometer is enabled" 2014-07-15 21:03:39 +00:00
Brian Haley
eea7621d23 Add DVR support to DevStack
This patch introduces a new Neutron  config option: Q_DVR_MODE.

The possible values are:

- legacy  : No DVR functionality
- dvr_snat: Controller/single node DVR
- dvr     : Compute node in multi-node DVR

When DVR is enabled the following configuration changes will be
in place:

- neutron.conf
  - router_distributed=True

- l3_agent.ini
  - agent_mode=$Q_DVR_MODE

- ovs_neutron_plugin.ini:
  - enable_distributed_routing=True
  - l2_population=True
  - tunnel_types=vxlan

Supports-blueprint: neutron-ovs-dvr

Change-Id: I669e054a8489fe7ac7f5c00df6535349d477e8c4
2014-07-15 12:07:21 -07:00
Dina Belova
58adaa6b75 Fix Neutron configuration if Ceilometer is enabled
Previously if Ceilometer service was enabled,
configuration option to enable Neutron network
notifications was not set. This fixes it.

Change-Id: Ia53d9db1828ef2daa0ce637b2a2635795856502c
Closes-Bug: #1340754
2014-07-13 17:30:35 +04:00
Edgar Magana
6f335b9a4b Add a Tunnel end-point variable for Neutron configuration
The HOST_IP address is being used as IP address
for end-point tunnel configruation. A new variable is
needed to specify a different IP address for the tunnel
end-point that Neutron will use

Change-Id: Ic7fb4853df167e78bf882af6a712b903db754dc2
Closes-bug: #1340433
2014-07-10 15:49:44 -07:00
Jenkins
9c0f077dd5 Merge "Fixed tunnel ranges variable inconsistency." 2014-07-07 13:09:24 +00:00
Anant Patil
3827dc03d8 Fixed tunnel ranges variable inconsistency.
Change-Id: I7108a3ebd597e1dc808917be9213457df2322100
2014-07-03 22:20:08 +05:30
Bartosz Górski
0abde393c5 Adds support for multi-region
Change-Id: Ib85fe7cb375692b04aca4c46f61ba7e1fbfa501b
Implements: blueprint multi-region
2014-07-01 14:58:35 +00:00
Jenkins
47e7a14319 Merge "Remove external attribute from the Provider Network" 2014-06-19 22:06:41 +00:00
Gary Kotton
13d385e402 Neutron: start to use nova's neutron configuration section
Commit 5cacad3508570ce70b1f9ef620e0508169687fda added support
of a neutron section. This updates the code to make use of
that section.

Change-Id: I86119476fde5066182d3aadcee5985019202647a
2014-06-17 23:26:44 -07:00
Sean M. Collins
21e6c62c15 Remove external attribute from the Provider Network
Co-Authored-By: Sridhar Gaddam <sridhar.gaddam@enovance.com>

Related-Bug: #1284718
Change-Id: Iad2f051a2b7b0a324dff4e716b8d2469a4f20895
2014-06-16 11:24:04 -04:00
Jamie Lennox
3561d7f9ed Use identity_uri instead of auth fragments
auth_token middleware now accepts a standard URL string as the parameter
identity_uri instead of specifying protocol etc individually. Change the
services over to use this.

Also changes over some other places in which the auth fragments are used
individually to the new variables and fixes up some misconfigurations of
auth_token.

identity_uri option was release in keystoneclient 0.8.0

Change-Id: Iac13bc3d08c524a6a0f39cdfbc1009e2f5c45c2a
2014-06-16 15:16:48 +10:00
Jenkins
14916d4c54 Merge "Create an IPv6 network that uses an external router for IPv6" 2014-05-30 18:16:36 +00:00
Jenkins
ced4ba63cd Merge "Add support for creating provider networks" 2014-05-30 03:49:00 +00:00
Sean M. Collins
e13fd6006d Create an IPv6 network that uses an external router for IPv6
Change-Id: Id1498d74db816b3edbb8376ca5acb7cc5792ea5c
2014-05-22 11:47:00 -04:00
Sean M. Collins
5ec6f8f15d Add support for creating provider networks
Implements blueprint neutron-provider-networking

Change-Id: I4bad9483b92875ea5e143b0e11652e01faed35a4
2014-05-22 11:47:00 -04:00
Terry Wilson
f06c4434f5 Fix notify_nova options
This patch fixes various typos that prevent the neutron nova
notification options from working.

Change-Id: Ia3fb1e02008b338e2d08e927346397292be4e398
Closes-Bug: #1321347
2014-05-20 10:56:48 -05:00
Gary Kotton
51c681d605 Add support for deprecated configuration vars in Juno
Just like the beginning of every other release, remove the deprecated
config option aliases that were marked as deprecated in Icehouse.

Nova patch - https://review.openstack.org/#/c/88456/

Change-Id: Idd051c516002030e8e191c7b8d31f1ff408e1c7d
2014-04-26 01:45:27 -07:00
Adam Gandelman
cf1ef23b72 Also pass FWAAS conf to VPN agent if enabled
If q-vpn is enabled, the Neutron neutron-vpn-agent is started
instead of the neutron-l3-agent, but only neutron-l3-agent receives
the fwaas_driver config when q-fwaas is enabled.  This ensures the FW driver
config is passed to either so that a properly configured agent is running
when the FWAAS extensions are enabled.

Closes-bug: #1310858

Change-Id: I237d2831a6b87ae46dfef047d3dc0b85fa6423d3
2014-04-21 17:35:22 -07:00
Jenkins
1593db2422 Merge "Devstack support for Neutron VPNaaS" 2014-04-17 21:09:08 +00:00
Paul Michali
746dceeb68 Devstack support for Neutron VPNaaS
Includes two enhancements to support VPNaaS and allow other
vendor implementation support. Goal is to provide a solution
for VPN .ini files until a more general solution can be defined
to handle all reference and vendor .ini files.

First, the /opt/stack/neutron/etc/vpn_agent.ini file is copied
to /etc/neutron, to allow the selected device drivers for agent
to be specified. Both reference and vendor implementations can
be uncommented in this file, prior to stacking.

Second, to allow vendor VPN implementations to provide an .ini
file to the agent at start-up time, an environment variable is
defined and can be set in the localrc to specify one or more
.ini files. The desire is NOT to include vendor settings in the
global vpn_agent.ini.

Change-Id: Ia8250db660216a5296cb6ba2af1538b8c90d187c
Closes-Bug: 1301552
2014-04-10 11:29:20 +00:00
Mark McClain
5cd250f11e Revert "Devstack support for Neutron VPNaaS"
This reverts commit 8450a92a4d0299fff89717e665ce31d54731d3f0.

Change-Id: I6dd0f44a1a57735de292bc4ed4eaa929dc308297
2014-04-09 16:42:54 -04:00
Jenkins
9ddac47be9 Merge "Devstack support for Neutron VPNaaS" 2014-04-09 17:54:49 +00:00
Dirk Mueller
5ca261aada Fix typo in nova_admin_username
The last parameter is unneeded, the value is always
set to "nova".

Change-Id: I7167d3559e8dfdb51ac8264e274f7ba167c18dfe
2014-04-04 22:48:02 +02:00
Paul Michali
8450a92a4d Devstack support for Neutron VPNaaS
Includes two enhancements to support VPNaaS and allow other
vendor implementation support. Goal is to provide a solution
for VPN .ini files until a more general solution can be defined
to handle all reference and vendor .ini files.

First, the /opt/stack/neutron/etc/vpn_agent.ini file is copied
to /etc/neutron, to allow the selected device drivers for agent
to be specified. Both reference and vendor implementations can
be uncommented in this file, prior to stacking.

Second, to allow vendor VPN implementations to provide an .ini
file to the agent at start-up time, an environment variable is
defined and can be set in the localrc to specify one or more
.ini files. The desire is NOT to include vendor settings in the
global vpn_agent.ini.

Change-Id: I5370ee57bbe326eff505a53055da4fddc0838de4
Closes-Bug: 1301552
2014-04-03 14:26:42 +00:00
Stephen Ma
9b38eb2392 Neutron.conf is not setup unless q-svc is enabled
In a multi-node environment, a node may have the neutron-
openvswitch-agent running but not the neutron API server.
The agent uses neutron.conf as one of the configuration
files. Devstack sets up neutron.conf only when q-svc is
enabled. Neutron.conf also needs to be configured when
q-agt is enabled.

Change-Id: I3d454caff0b49a61ee1a78f68b1bca98e29f21de
Closes-Bug: 1184064
2014-04-02 04:25:05 +00:00
Jakub Libosvar
815782de27 Fix typo in setting neutron to notify nova about port change
Change-Id: I4d1c8076c5943359088e3cd5226adb8fcaa683e7
2014-03-21 16:53:19 +01:00
Aaron Rosen
cea32b1f86 Configuration needed for neutron nova callback
Change-Id: I07cb476f5e87e967cd6fbbfc82881e8a147453b4
2014-03-10 12:14:38 -07:00