71 Commits

Author SHA1 Message Date
Jenkins
9f935cbd4a Merge "devstack (stack.sh) fails when extra config files are specified" 2014-03-04 01:13:06 +00:00
Jenkins
f07a209ce0 Merge "Fix Neutron enabled check" 2014-02-28 07:33:34 +00:00
sukhdev
c03f975150 devstack (stack.sh) fails when extra config files are specified
Latest merge of https://review.openstack.org/#/c/71996/ exposes an issue
in stack.sh which did not surface before.

Please see the details of the issue in the bug description.

Closes bug: 1285884

Change-Id: Ie231c9835497c2a418a61d339dfd5df1aab9e3d7
2014-02-27 14:27:07 -08:00
Dean Troyer
e2907b4838 Fix Neutron enabled check
* Remove the check for neutron enabled on a block of variable settings, there
  is no conflict and serves no purpose.
* Also floating_ips.sh and volume.sh needed to properly source lib/neutron
  for do ping_check() to work properly.

The current error in check-devstack-dsvm-neutron is not related to this fix.

Change-Id: I1c458aaa787ffb98c945aefc3afa80c6861a405f
2014-02-27 15:37:11 -06: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
Steve Martinelli
19685428e3 Change most keystoneclient commands to openstacklient in libs
migrated most keystoneclient commands from the following libs:
 ceilometer
 cinder
 ironic
 keystone
 marconi
 neutron
 nova
 savanna
 swift
 trove

Also need to set and unset openstackclient specific environment
variables from stack.sh

Change-Id: I725f30bc08e1df5a4c5770576c19ad1ddaeb843a
2014-02-14 21:30:57 -06:00
Dean Troyer
e4fa721322 Begin is_service_enabled() cleanup
This converts the special cases in the is_service_enabled() function to call
individual functions declared by the projects.  This allows projects that
are not in the DevStack repo and called via the extras.d plugin to handle
an equivalent service alias.

* Ceilometer
* Cinder
* Glance
* Neutron
* Nova
* Swift

TODO: remove the tests from is_service_enabled() after a transition period

Patch Set 2: Rebased

Change-Id: Ic78be433f93a9dd5f46be548bdbd4c984e0da6e7
2014-02-07 10:06:21 -06:00
Jenkins
e0ed8ea038 Merge "Generate Tempest service list rather than hard-code it" 2014-01-30 14:38:12 +00:00
Dean Troyer
4237f590b7 Generate Tempest service list rather than hard-code it
The list of services that Tempest used to set its 'service_available'
config values was hard-coded. To be plugin-friendly have each
service (project) add its name to the TEMPEST_SERVICES variable
and use that for setting the 'service_avilable' values.

Change-Id: I208efd7fd0798b18ac2e6353ee70b773e84a2683
2014-01-29 17:25:45 -06:00
Jakub Libosvar
1f76328027 Stop all neutron-ns-metadata-proxy with stop_neutron
Process name is actually python therefore neutron-ns-metadata-proxy
pattern didn't match wanted process.

Closes-bug: #1269982
Change-Id: Ib4439b0d32f103253b461841fa903c65763ff280
2014-01-28 23:02:29 +01:00
Jenkins
e9d4079e4e Merge "Remove old DEFAULT.root_helper setting" 2014-01-25 16:45:48 +00:00
Jenkins
83d56a2ab7 Merge "Typo: funstions=>functions" 2014-01-25 09:28:44 +00:00
Jakub Libosvar
cf903938ec Added missing sudo when killing ns-metadata
Closes-bug: #1269982
Change-Id: Ib6b641a8d5c92fb4a8aaed6b5d7b63e66acd6bd9
2014-01-21 12:40:37 +01:00
Jenkins
3f5250fff3 Merge "Fix stop_neutron metadata agent function" 2014-01-19 05:23:37 +00:00
Emilien Macchi
04f6dc24a7 Fix stop_neutron metadata agent function
Currently, stop_neutron fails in Jenkins because it kills itself.
This patch ensure we kill only neutron metadata agent, and not the awk
process in itself.

Change-Id: I25d1d90e002fa9eb3c5bc366cc74cb70a2daa69f
Closes-bug: #1269982
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
2014-01-17 00:17:31 -05:00
Joe Gordon
14daa57d67 Remove old DEFAULT.root_helper setting
root_helper is now under the agent group and not DEFAULT

Change-Id: I11867f7ceff1f3b8b0bc2ef8aa508b6ecee653fc
2014-01-15 21:43:25 +00:00
Joe Gordon
2394605a63 Typo: funstions=>functions
Change-Id: I59caf62b049d09450ce3236648cf1ede2f48e7f5
2014-01-15 21:42:32 +00:00
armando-migliaccio
ef1e08022b Add sanity check framework to verify neutron server/backend integration
Some Neutron plugins require controllers and multiple backend services
to operate correctly. This patch adds the framework for third party
plugins to run sanity checks after Neutron Server has started.

This simple addition may reveal potential configuration pitfalls
much earlier in the dev/test cycle, thus speeding up the build
churn process.

The first plugin that uses this framework is the VMware NSX one.

Closes-bug: #1265671

Change-Id: I17f9c5c8e828316ff03f0eff42ae4ae6c6c58733
2014-01-14 08:14:25 -08:00
Dirk Mueller
25049cd23d Use --tenant-id, not --tenant_id
Change-Id: I0e3d65d5b69ac82cbf7ee6ffc41ead369af8c126
2014-01-09 13:55:28 +01: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
Jenkins
fedaf6f246 Merge "Stop Neutron advanced service external processes" 2013-12-18 00:04:07 +00:00
Jenkins
5fc612bbf2 Merge "Default to /24 prefix for floating IP range with neutron" 2013-12-17 09:08:59 +00: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
Salvatore Orlando
90234ac4b0 Default to /24 prefix for floating IP range with neutron
When running Tempest parallel tests with neutron, several long-running
tests might create routers and floating IPs, which will result in
IP allocations over the public network.

Increasing the public network size should ensure tests do not fail
due to IP address shortage; this patch also updates the public network
gateway IP address.

Related-Bug: 1253966

Change-Id: Ie075b3c4d14a07b06c42fd29b09770dd1972aa45
2013-12-15 04:25:20 -08:00
Jenkins
adc9fd18e5 Merge "Make tempest L3 capable plugin aware." 2013-12-09 02:32:39 +00:00
Jenkins
02ef0dbfb0 Merge "add assertions for blind grep" 2013-12-05 00:19:49 +00:00
Jenkins
8c57e28813 Merge "Fix neutron log format with colorization" 2013-12-02 01:12:34 +00:00
Salvatore Orlando
bc7f643bb7 Fix neutron log format with colorization
Closes-Bug: #1254817

Change-Id: I6de17ef15c18e2f8ab246934461a2b7c6ae4f95f
2013-11-27 06:14:45 -08:00
Tomoe Sugihara
afbc631cb8 Make tempest L3 capable plugin aware.
With this patch, the public network config in tempest.conf will be
done for the plugins that support L3.

Change-Id: I820fe300fac45ff92d1281ff0c43ebc137783210
2013-11-27 14:57:00 +09:00
Emilien Macchi
a677b7fe82 Move neutron cache dir into a function
Taking the model of Nova, this patch aims to move the cache directory
management into a function with the goal to reuse it somewhere else like
Grenade.

Change-Id: I93df52f69ef339e6528b88d88d4ea70e0b725893
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
2013-11-26 08:12:50 +01: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
Stephan Renatus
e578effb33 Make use of STACK_USER instead of relying on USER
Quite easily one ends up calling ./stack.sh in an environment that,
albeit being user "stack" (for example), doesn't quite meet the
expectations of devstack.  The errors that follow can be rather hard to
track down, as the dependency on `USER` is not mentioned.

To remedy this situation, this commit

- uses STACK_USER instead of USER and
- mentions that dependency in the script headers of lib/*

Change-Id: If4cdc39b922ea64b4c0893a0e695ec06349fccc5
2013-11-19 13:39:58 +01:00
Jeff Peeler
1143f7e45f Turn off Nova firewall driver when using Neutron
As referenced in the OpenStack documentation, the firewall_driver in
nova.conf should be set to nova.virt.firewall.NoopFirewallDriver, "so
that nova-compute does not perform iptables-based filtering itself".

Without this change, the driver gets set to
nova.virt.libvirt.firewall.IptablesFirewallDriver, which seems to
make networking unusable.

Change-Id: Id9cce0f5f4efe719683aaf3284b128188b61b919
Closes-bug: #1246888
2013-10-31 16:49:30 -04:00
Jenkins
b7c11a0f98 Merge "Fix some Markdown formatting issues" 2013-10-31 14:19:15 +00:00
Jenkins
8e285072c9 Merge "Fix shocco errors and warnings" 2013-10-31 14:18:32 +00:00
Aaron Rosen
4540d00ebd All neutron plugins should now use LibvirtGenericVIFDriver
Change-Id: I70015ae55fe6db9c6c4663a8d021fe9cfe2eddcf
2013-10-24 23:01:16 -07:00
Adam Spiers
6a5aa7c6a2 Fix some Markdown formatting issues
Address miscellaneous issues with Markdown formatting in comments which
are consumed by shocco when generating the online documentation.

Change-Id: I953075cdbddbf1f119c6c7e35f039e2e54b79078
2013-10-24 17:38:19 +01:00
Adam Spiers
cb961597cc Fix shocco errors and warnings
A few Markdown-oriented issues were causing Docutils errors to
leak into the end-user docs on http://devstack.org

Change-Id: I51fa9698afb1bfb48596478d83bd1fdcd84ac52e
2013-10-24 15:43:05 +01:00
DennyZhang
23178a997a add assertions for blind grep
blind grep is error-prone.
Add assertions for errors we can not handle

Change-Id: Ibe19085545ecc848498506e8b8ee14e71825b273
2013-10-22 17:12:18 -05: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
06e54c7477 Merge "Using no proxy option to skip wget and curl proxy settings in config" 2013-10-04 19:17:09 +00:00
JUN JIE NAN
0aa8534ada Using no proxy option to skip wget and curl proxy settings in config
When end users specify proxy settings in config file for wget /etc/wgetrc:
http_proxy = http://...
or for curl ${HOME}/.curlrc:
proxy = http://...

Using `http_proxy="" wget' can not skip the proxy setting in the
config files, also it can skip proxy settings in env viriables.

In order to skip proxy setting in both env and config file, we pass
--no-proxy option for wget, and --noproxy '*' for curl.

Fixes bug #1224836

Change-Id: I2b25aeca9edf2ce4525fb1db325e5e24c18b4d55
2013-09-30 16:03:00 +08:00
Kyle Mestery
6d23500aa6 Default to the ML2 plugin in Neutron instead of OVS
In Icehouse, the OVS and LinuxBridge plugins are being deprecated in
favor of the Modular Layer 2 (ML2) plugin. This change modifies
devstack to default to ML2 when Neutron is used for networking.

Fixes bug 1220745

Change-Id: I9a4c84b04727a710219fc11f862a655309ffb99b
2013-09-24 23:51:32 +00:00
Salvatore Orlando
05ae833be2 Colorize Neutron log output and refactor log setup code
Bug 1214616

This patch adds colors to on-screen Neutron log output in the same way nova,
cinder, and heat engine do.
To this aim, colorized logging configuration has been moved to ./functions.
The reason for this refactoring is that these instruction are the same or
very similar for each project, with the only exception of the target
configuration file.

Change-Id: Idf0d1b842bb9ab046c9ef826de1dfc55b3f1df9d
2013-09-13 10:34:40 -07:00
sbauza
e2c4ee2364 Fix Neutron issues related to Baremetal service
When deploying devstack on a single host with a single NIC and
baremetal and neutron services enabled, the host looses Internet
access as default route is deleted.

Also, if localrc is not correctly set with correct values, OVS ports
and Neutron net and subnet aren't created (commands missing
arguments), we need devstack to properly fail.

Change-Id: I7f39bbdf7b8cb544b8b4a59effe16f04b85d1425
2013-09-04 13:55:42 +02:00
Jenkins
364472409b Merge "Fix deprecated params user_id, role_id, tenant_id" 2013-09-03 21:10:46 +00:00
Jenkins
c77741298b Merge "Disable neutron quotas when using fake virt driver" 2013-09-03 19:29:55 +00:00
Jorge Valderrama Romero
f39ee96f1d Fix deprecated params user_id, role_id, tenant_id
Update keystone cli by changing parameter options (user_id, role_id and tenant_id)
to use '-' rather than '_' in the method user_role_add and consequently the method
user_role_remove without maintain backward compatibility because these are deprecated.

python-keystoneclient - Bug #1150434
Change-Id: Ia5113718eb050cf7dba443b8d0caf3bdaa1730f0
2013-09-02 17:54:27 +02:00