119 Commits

Author SHA1 Message Date
fumihiko kakuma
5a110d4e68 Add configurations for the OpenFlow Agent mechanism driver
This patch supports configurations for an environment of the OpenFlow Agent mechanism driver
Set the following variables in a localrc to be ran this mechanism driver.

Q_ML2_PLUGIN_MECHANISM_DRIVERS=ofagent
Q_AGENT=ofagent

Implements: blueprint ryu-ml2-driver
Change-Id: I774da9a26f241487dfa4ec124b12f528704d860b
2014-03-01 16:16:54 +09:00
Jenkins
dad6e4114d Merge "Enforce function declaration format in bash8" 2014-02-28 06:32:20 +00:00
Jenkins
9d43deb2f3 Merge "Implements fix to run lbaas service on fedora with devstack" 2014-02-28 01:43:12 +00:00
Ian Wienand
aee18c749b Enforce function declaration format in bash8
Check that function calls look like ^function foo {$ in bash8, and fix
all existing failures of that check.  Add a note to HACKING.rst

Change-Id: Ic19eecb39e0b20273d1bcd551a42fe400d54e938
2014-02-28 07:59:03 +11:00
Ian Wienand
b8e250232e Add end-of-file checks to bash8
Add two end-of-file checks to bash8.  Firstly, alert if heredoc hasn't
finished.  Some heredocs were done like:

---
sudo bash -c "cat <<EOF > foo
...
EOF"
---

(A better way to do this is "cat <<EOF | sudo tee ..." as it retains
the usual heredoc layout in the code).

The trailing quote was throwing the matching in bash8 off and it kept
appending the next file as if it was still part of the heredoc.  To
avoid this, we check if we're still in a heredoc when we start a new
file; if so raise an error and reset the heredoc status fresh.  We
track the state of the previous file, line and lineno so we can give a
good error.

---
E012: heredoc did not end before EOF: 'cat <<EOF'
 - lib/trove: L221
---

This includes fixes for the existing problem heredocs.

A similar EOF check is to ensure the previous file ended with a
newline.

---
E004: file did not end with a newline: '$MY_XTRACE'
 - lib/neutron_plugins/embrane: L40
---

This requires only one fix

Change-Id: I5e547d87b3921fc7ce6588c28f074e5c9f489c1f
2014-02-26 09:31:15 +11:00
Rabi Mishra
f2ca87a8d8 Implements fix to run lbaas service on fedora with devstack
changes 'user_group = nobody' in 'haproxy' section of lbaas_agent.ini

Change-Id: I801fec5a11d8abd97cb6f5cdff35fabb9eaf9000
Closes-Bug: 1283064
2014-02-21 20:51:20 +05:30
Ryu Ishimoto
18d5c833d4 Remove provider router configuration
To be compatible with the Icehouse release of MidoNet, the
provider router configuration is removed from devstack since
it is no longer necessary to configure it.

Change-Id: I4be2d9bbf2c82fd375702cbb1d60c3277086134f
Implements: blueprint remove-provider-router-config-for-midonet
2014-02-19 00:41:41 +09:00
Akihiro Motoki
4074e29811 Use lowercase section name in Neutron ML2 security group config
All other security group configs in Neutron are lower-case
and it should be consistent.

Change-Id: I683333c1e186446a69172446cca6d9b952673ed4
Closes-Bug: #1279862
2014-02-14 02:29:03 +09:00
Jenkins
984a89bc33 Merge "Embrane Plugin Support" 2014-02-11 10:11:00 +00:00
Sean Dague
16dd8b3ed9 introduce if/then & for/do rules
we mostly have a consistent style on if/then & for/do in devstack,
except when we don't. This attempts to build a set of rules to
enforce this.

Because there are times when lines are legitimately long, and there
is a continuation, this starts off ignoring if and for loops with
continuations. But for short versions, we should enforce this.

Changes to make devstack pass are included. The fact that the
cleanup patch was so small is pretty solid reason that this is
actually the style we've all agreed to.

Part of a git stash from hong kong that I finally cleaned up.

Change-Id: I6376d7afd59cc5ebba9ed69e5ee784a3d5934a10
2014-02-05 07:52:54 +01:00
armando-migliaccio
41e36d6bcd Replace NvpPluginV2 with NsxPlugin
The king is dead, long live the king!

Partial-implements blueprint: nicira-plugin-renaming

Change-Id: I9b71479a8d4228d45a6591b169c489c0107fb04c
2014-02-04 13:39:32 -08:00
Ivar Lazzaro
a03607d03f Embrane Plugin Support
Implements blueprint embrane-plugin-support

This commit implements Embrane's Neutron plugin installation support
in Devstack.
This is an extension of the openvswitch installation module, which is
used by the main plugin, and enables configuration by localrc

Change-Id: Ia4824f8d2300bcdce170d226145bbce6088f1557
2014-02-03 06:42:02 -08:00
Shiv Haris
55d9b9a951 Fix typo NEUTON to NEUTRON
Fixes bug: #1269111

Change-Id: Icf66b4d474698b5f3ca22bc656ecd12d03164bce
2014-01-14 11:39:15 -08:00
armando-migliaccio
05952e3fcc Configuration changes required to support VMware NSX plugin
(Formerly known as Nicira NVP plugin).

Following Neutron change 79fbeb7ebebc0dfbe143aee96fbc250d1b9e7582,
this patch introduces the new naming scheme for Neutron VMware NSX
plugin configuration.

Related-blueprint: nvp-third-part-support (aka bp vmware-nsx-third-party)
Partial-implements blueprint: nicira-plugin-renaming

Change-Id: If7790887661507bfdec6d2b97c0f99609039aa73
2014-01-05 08:01:16 -08:00
Jenkins
15d2526db9 Merge "Neutron: Define a utility function to add neutron service class" 2014-01-01 13:28:32 +00:00
Isaku Yamahata
9e136b4ade Neutron: Define a utility function to add neutron service class
When enabling neutron service (i.e. enable_service q-xxx), related code
unconditionally adds a necessary plugin class to Q_SERVICE_PLUGIN_CLASSES.
Which may cause duplication in Q_SERVICE_PLUGIN_CLASSES when
Q_SERVICE_PLUGIN_CLASSES is explicitly specified in localrc.
As a result, neutron server fails to start.

This patch introduces a utility function to add service class,
and check duplication.

Closes-Bug: #1261291
Change-Id: Id2880c7647babfccc3e8d9fc60dd93c4b3997ed9
2013-12-19 17:37:35 +09:00
Akihiro Motoki
edddb1fddf Stop Neutron advanced service external processes
Some of Neutron advanced services (LBaaS, VPNaaS, ....) creates
external processes and they should be stopped in unstack.
This commit defines neutron_<XaaS>_stop functions for all services
and implements the cleanup logics if necessary.

Also cleanup_neutron removes netns used by LBaaS haproxy.

Change-Id: Ied3a2c374ffcb6b59ecaf1027fb6e6083eded2ae
2013-12-16 17:23:40 +09:00
Tomoe Sugihara
81fe5f5498 Define Q_L3_ENABLED=True for MidoNet plugin
Change-Id: Iabf7a5ff2e53b1822a327600da9acac8cf6a59f7
2013-12-11 04:01:40 +00:00
Jenkins
010a224066 Merge "Adds entries for missing parameters in PLUMgrid plugin" 2013-12-05 12:13:01 +00:00
Edgar Magana
500a32f4f8 Adds entries for missing parameters in PLUMgrid plugin
Three configuration parameters were missing for the PLUMgrid plugin.
In this patch all those three have been properly added.

Change-Id: If070aa5eb35678d0984470ebcd43fd99e08bcc8a
Closes-Bug: #1255808
2013-12-02 14:27:31 -08:00
Akihiro Motoki
130c90ed0b Do not create an unnecessary file "ml2"
Previously when running devstack with Neutron ML2 plugin,
an unnecessary file "ml2" is created in devstack directory.
It is because when the first argument is not defined the second
argument becomes the first one.

This change moves the first "options" argument of populate_ml2_config
to the last and checks the given options has a value before adding
them to a file.

Change-Id: I9ff40456798c42216d414d5f8d443e671ab7d497
Close-Bug: #1255853
2013-11-28 17:10:44 +09:00
Jenkins
cdf722cc09 Merge "Add Neutron Metering Agent support" 2013-11-22 15:14:46 +00:00
Emilien Macchi
40546f79e0 Add Neutron Metering Agent support
In Havana, Neutron has now a Metering Agent which gets meters from
virtual routers.

This patchs aims to allow devstack using this new service.

Change-Id: I17ad83799d60384247b98cc8a93ac032f641c721
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
2013-11-20 15:22:33 +01:00
Jenkins
c6d9bf1fa0 Merge "Modification for Ubuntu 13.10 and minor fixes in Neutron NEC plugin" 2013-11-07 03:06:09 +00:00
Jenkins
7941ffad4d Merge "Cleanup unused settings, use interface_driver setter" 2013-11-07 01:55:55 +00:00
Joe Mills
e4a523f543 Cleanup unused settings, use interface_driver setter
* Remove unused MIDONET specific settings from nova.conf
* Remove unused MIDONET specific settings from dhcp_agent.ini
* Move the interface_driver settings to the proper setting
  function so that it can be used by lbaas_agent.ini as well.

Change-Id: Id686ff5f55db00bce42b8a2bd56e7655c73211fb
Closes-Bug: #1245401
2013-10-28 09:44:23 +00:00
Aaron Rosen
4540d00ebd All neutron plugins should now use LibvirtGenericVIFDriver
Change-Id: I70015ae55fe6db9c6c4663a8d021fe9cfe2eddcf
2013-10-24 23:01:16 -07:00
Akihiro MOTOKI
7a4ae3d242 Modification for Ubuntu 13.10 and minor fixes in Neutron NEC plugin
Modifications for Ubuntu 13.10:
* Add .conf suffix to apache2 config files. In Ubuntu 13.10,
  files in sites-available should have ".conf" suffix.
  Otherwise it is not recognized by a2ensite.
* libglib2.0-dev is added to lib/files/apt/trema. Trema is
  an OpenFlow controler framework used by Neutron NEC plugin
  Ubuntu package dependency seems to be changed.

Minor cleanups are also done in OVS configuration:
* Set datapath_id before connecting to the OpenFlow controller
  to ensure datapath_id changes after connected.
  Previously datapath_id is changed after connecting to the controller.
* Drop "0x" prefix from datapath_id passed to OVS.
  OVS ignores datapath_id with 0x prefix.
* Fix a bug that SKIP_OVS_BRIDGE_SETUP skips all confiugration of
  the plugin agent. It should skip only OVS setup.

Change-Id: Ifac3def8decda577b5740c82fe8d24e8520c7777
2013-10-23 15:47:06 +09:00
Sean Dague
3bdb922c40 fix bash8 indent problems in lib/neutron and friends
Change-Id: Ia83ce84b792494800fbfe7baa6423c8de9260014
2013-10-22 12:59:25 -04:00
Jenkins
8c1a88fd3a Merge "Make nova use fatal_deprecations=true" 2013-10-22 13:13:02 +00:00
Jenkins
31b1a7e136 Merge "Add MIDONET settings to dhcp.ini" 2013-10-22 12:28:47 +00:00
Joe Gordon
e095daa732 Make nova use fatal_deprecations=true
We should not be using deprecated config options here, so lets set
fatal_deprecations=True to make sure.

Stop using deprecated LibvirtHybridOVSBridgeDriver

Change-Id: I0a43780270d092a42ede6c0667343f0d02b3aa67
2013-10-22 09:52:27 +01:00
armando-migliaccio
976e418a03 Specify ip address for nova metadata server for nicira plugin
Supports blueprint nsx-integrated-services

Change-Id: I265b9714ca531731b0b2e1b37e64c912666aed80
2013-10-08 12:22:06 -07:00
armando-migliaccio
ec0ff2acf8 Specify agent mode and service cluster uuid for nicira plugin
Supports blueprint nsx-integrated-services

Change-Id: Ib02716fe447f1d7f47f2f49d16f0d2ad7afe741f
2013-10-07 19:06:53 +00:00
Joe Mills
a2fd222ee9 Change Midonet vif driver to generic
Use generic vif driver for Midonet to support port bindings through
the mm-ctl script.

Change-Id: Iddc8a1c7b0128a76cd778c0245f2098bfb2c0145
Closes-Bug: 1235202
2013-10-04 11:46:10 +00:00
Joe Mills
87acc91fc6 Add MIDONET settings to dhcp.ini
The midonet specific settings were not being added to the dhcp
specific config file. This change adds those settings.

Closes-bug: #1233941
Change-Id: I4155135528c6ba77cf57d30ac256580c7239794f
Signed-off-by: Joe Mills <joe@midokura.com>
2013-10-02 03:22:39 +00:00
Kyle Mestery
14ea1a2b79 Correctly set the L3 service plugin for ML2
ML2 uses a service plugin for L3. This patch to devstack
correctly sets this by setting or updating the variable
Q_SERVICE_PLUGIN_CLASSES, which makes ML2 compatible when
running with other service plugins (e.g. LBaaS and VPN).

Fixes bug 1231622

Change-Id: I0ce1f5a42bd052995135ffac1ee5ef382d69789e
2013-09-22 03:11:31 +00:00
Jenkins
7a4fe3d5f2 Merge "Changes to make Devstack work with Neutron L3 plugin patch." 2013-09-10 18:02:30 +00:00
Jenkins
474f297420 Merge "Modify midonet plugin to support the latest MidoNet" 2013-09-10 15:38:06 +00:00
Jenkins
29ac6307a4 Merge "Augment instead of override extra ML2 options." 2013-09-10 15:36:47 +00:00
Bob Melander
748fe3d5e3 Changes to make Devstack work with Neutron L3 plugin patch.
Implements bp/quantum-l3-plugin-support

Change-Id: I0c56661685fb641efe34fee1390d7d4f37f84494
2013-09-09 20:29:52 +02:00
Kyle Mestery
061d52507d Augment instead of override extra ML2 options.
The existing ML2 code overwrote extra options set in localrc with
defualt values in some cases. This fixes it so it no longer does
that and instead adds to rather than overrides those values.

Fixes bug 1222854

Change-Id: Iafdaad7d4253f1b61e8a214c50adaf7599a641f2
2013-09-09 08:52:19 +00:00
Ryu Ishimoto
35f0966d35 Modify midonet plugin to support the latest MidoNet
MidoNet has been upgraded and devstack needs to be updated to
be compatible.  This change is required to run the current
version of MidoNet plugin with DevStack.

Closes-Bug: #1222314
Change-Id: If3379b4d5da4e4fcf989ee7398b5952d71b68d5a
2013-09-08 12:09:41 +09:00
Jenkins
25b0ab870a Merge "Support OpenSwan in Neturon VPNaaS" 2013-09-06 16:32:58 +00:00
Kyle Mestery
bc6324771b Default to linuxbridge and openvswitch drivers for ML2.
Since the addition of ML2 port-binding, the linuxbridge and openvswitch
drivers are required to be loaded when running with ML2. This small
patch adds their loading into ML2 into devstack.

Fixes bug 1220743

Change-Id: I97c5f4e0e4af59766e0084ed3b2dea2843cb33bf
2013-09-06 15:05:56 +00:00
Nachi Ueno
1e3d318c86 Support OpenSwan in Neturon VPNaaS
Neutron VPNaaS chagned ipsec package for
OpenSwan. This commit updates the package.

Change-Id: I333501a405fbc552c575d26cfbac083646d05dfd
2013-09-04 22:02:11 -07:00
Kyle Mestery
3ea28ece4a Correctly setup ML2 mechanism_drivers
The ML2 code in devstack was not correctly configuring the mechanism_drivers
when asked to do so. This corrects the typo in the variable assignment, and
also actually sets these in the plugin configuration file.

Fixes bug 1208557

Change-Id: I3746ca099f45d44dcf1cc2ca1c3726745b8e8a1d
2013-08-05 12:25:26 +00:00
Jenkins
e024bee3ed Merge "Update to PLUMgrid plugin configuration" 2013-08-04 16:13:32 +00:00
Jenkins
ffc7fab1a0 Merge "Add Midonet plugin support to devstack." 2013-08-01 20:20:37 +00:00
av-mido
2c3428b1ed Add Midonet plugin support to devstack.
Add support for Midokura's Midonet plugin to devstack,
in lib/neutron_plugins and lib/neutron_thirdparty.

Change-Id: I9b4d90eab09bbb21b9ba251a311620e0a21e8219
2013-07-30 10:59:15 +09:00