93 Commits

Author SHA1 Message Date
Henry Gessau
c48afe4bc0 Do not install openvswitch-datapath-dkms on Ubuntu 14.04
Change-Id: I8c58d998011427a202c79c45b87b5eca5ceaaa71
Closes-bug: #1331111
2014-06-22 16:10:56 -04:00
Jenkins
0099487f18 Merge "Wait for OVS to reconfigure when creating PUBLIC_BRIDGE" 2014-06-18 11:14:36 +00:00
Dave Tucker
f60e8c0fbe Wait for OVS to reconfigure when creating PUBLIC_BRIDGE
The '--no-wait' flag will not wait for ovs-vswitchd to reconfigure after
changes have been made to the database. This causes a race condition as
the bridge may or may not be up when 'ip addr flush dev $PUBLIC_BRIDGE' is
called. This commit removes the '--no-wait' flag which is safe as the
openvswitch services are already started earlier in stack.sh

Change-Id: I73ef1b731295d03b0f064c5f786196284c3e39ce
Closes-bug: #1328962
2014-06-12 00:09:06 +01:00
Gary Kotton
b405256309 VMware NSX: fix typo
Fix typo in the Neutron VMware NSX driver

Change-Id: I0519e30469c5cfbf285b2ad1032d110f8e9fdbb4
2014-06-11 04:18:08 -07:00
Jenkins
8cedabcea8 Merge "stack.sh fails for Cisco plugin with missing cisco_plugins.ini error" 2014-05-10 12:24:16 +00:00
Kyle Mestery
bd0855056b Fix incorrect comparisions
The files changed in this commit had incorrect bash syntax in that they were
assigning variables (=) instead of checking if they were equal (==). The
incorrect checks were preventing the configuration of VLANs with the Neutron
ML2 plugin.

Change-Id: I4b54bb5c69cc836c22900bd7a966197e9c616076
2014-05-08 10:29:34 +00:00
Edgar Magana
41a4f27ef7 Add driver parameter for PLUMgrid configuration file
PLUMgrid plugin for Neutron supports to load dynamically a back-end driver.
This parameter has been added in the plugin configuration file.

Change-Id: I1698a8fa558841aeb94476bc8c7f103b21f2a2d3
Closes-bug: #1315466
2014-05-01 16:38:10 -07: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
Jenkins
d191ade014 Merge "Add missing function neutron_plugin_configure_service to brocade specific file" 2014-04-23 16:57:21 +00:00
Shiv Haris
815ef98fa2 Add missing function neutron_plugin_configure_service to
brocade specific file

Closes bug: 1304701

Change-Id: I18f90865a015b9dc6db4123d46492140ca67a38f
2014-04-08 17:22:35 -07:00
Ralf Haferkamp
ce03d10287 Fix openvswitch package and service names for openSUSE
Change-Id: Iaf173422e4d009bdd7ed7ed79af2269c44039060
2014-04-07 17:02:39 +02:00
Dean Troyer
e3a9160c0d Fix Neutron plugin XTRACE handling
The various Neutron plugin files need to have unique variables for the
xtrace state as they are sometimes nested more than two levels deep
and MY_XTRACE is getting stomped.  This gives each of the neutron_plugin
and neutron_thirdparty include files a unique XTRACE state variable.

I don't think this is a problem with any of the other plugin include
files (yet) so this just handles Neutron for now.

Change-Id: I7c272a48e7974edecaff5f431ff7443dd6622588
2014-03-28 12:40:59 -05:00
Jenkins
2923e6072b Merge "Use neutron security groups in BigSwitch plugin" 2014-03-21 01:18:08 +00:00
Dane LeBlanc
c68a8f67a7 stack.sh fails for Cisco plugin with missing cisco_plugins.ini error
When the Cisco Nexus monolithic plugin is configured in the localrc,
stack.sh fails with the error message:
     sed: can't read /etc/neutron/plugins/cisco/cisco_plugins.ini:
          No such file or directory

This failure was introduced with the merge of change set 76992
(bug #1285884). Change set 76992 removed the copying of
Q_PLUGIN_EXTRA_CONF_FILES from the neutron project area to directories
under /etc/neutron. This copy from neutron to /etc is required by the
Cisco Nexus monolithic plugin, since this plugin follows the original
model for generating extra config files based on localrc settings:
 - Copy default config file(s) from neutron project to /etc using
   a relative path (relative to neutron and relative to /)
 - Modify the copies of the config file(s) using localrc settings
 - Add a --config-file command line setting for neutron server which
   points to the modified config file(s) under /etc

The fix is to add the copying of the default versions of the extra
config files from neutron to /etc into the cisco devstack script.

Change-Id: Ifbae197ed591f7cccfd6d51eae2b21e31eb0a409
Closes-Bug: #1295411
2014-03-20 19:25:03 -04:00
Jenkins
78de586217 Merge "Supporting Nuage Networks' Plugin through devstack" 2014-03-14 06:36:43 +00:00
Hemanth Ravi
d78c4057d4 Install script for One Convergence Neutron plugin.
Change-Id: I1dcc625a7c986e7533820b01af9eee5b8addcffe
Implements: install for blueprint oc-nvsd-neutron-plugin
2014-03-11 14:29:04 -07:00
Jenkins
f0d3027500 Merge "NCCLIENT_REPO is using the wrong url" 2014-03-06 03:20:54 +00:00
ronak
ae17289173 Supporting Nuage Networks' Plugin through devstack
Nuage networks' plugin specific configuration setting file for devstack

Change-Id: I936f87b8fbc6f90130514b2fc0d111eab861da7c
Implements: blueprint nuage-networks-plugin
2014-03-04 20:43:05 -08:00
Jenkins
a98721da9c Merge "Add configurations for the OpenFlow Agent mechanism driver" 2014-03-04 01:05:25 +00:00
Kevin Benton
753afeba74 Use neutron security groups in BigSwitch plugin
Configures the Big Switch third-party plugin to
use neutron security groups instead of nova
security groups.

Change-Id: I6bc3046ff0e70b8288a7c3f3d6f975376adc081a
Implements: blueprint bigswitch-neutron-security
2014-03-03 11:53:51 -08:00
Jenkins
20e176dc3a Merge "Adds support for IBM SDN-VE Neutron plugin" 2014-03-03 19:52:50 +00:00
Shweta P
de3b82037d NCCLIENT_REPO is using the wrong url
NCCLIENT_REPO value in lib/neutron_plugins/cisco is pointing to a repo
that does not exist. This fix corrects the url.

Closes-Bug #1286302

Change-Id: I42db0b3f7a4bbf5d1d053e3da8b4fbb67d47de94
2014-03-03 13:46:10 -05:00
Mohammad Banikazemi
729236ca1a Adds support for IBM SDN-VE Neutron plugin
This provides the support for the monolithic plugin
for IBM SDN-VE that is being added to Neutron here:
https://review.openstack.org/#/c/66453/

Implements: blueprint ibm-sdnve-plugin-support
Depends-On: I92619a95bca2ae0c37e7fdd39da30119b43d1ad6
DocImpact

Change-Id: I0958457355036fdab93156cd7fb4afd1a458918b
2014-03-03 09:50:03 -05:00
Jenkins
3de8607a4c Merge "Replace NvpPluginV2 with NsxPlugin" 2014-03-01 18:40:41 +00:00
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