1295 Commits

Author SHA1 Message Date
Jenkins
46be1ea2ff Merge "Configuration needed for neutron nova callback" 2014-03-11 02:14:59 +00:00
Jenkins
a508d1a001 Merge "put libvirt debug in the right place" 2014-03-10 21:27:40 +00:00
Jenkins
a35bd8b70f Merge "Enable marconi-server to run when USE_SCREEN=false" 2014-03-10 19:31:46 +00:00
Aaron Rosen
cea32b1f86 Configuration needed for neutron nova callback
Change-Id: I07cb476f5e87e967cd6fbbfc82881e8a147453b4
2014-03-10 12:14:38 -07:00
Jenkins
586fd791a0 Merge "Take tempurl out of Swift pipeline additions" 2014-03-10 15:46:07 +00:00
Sean Dague
13349080b1 put libvirt debug in the right place
libvirt debug setting was happening in a place where we weren't
actually resetting the daemon. Move it to into the hypervisor
plugin where we do.

Change-Id: Ia79b0ef50f6b8fb007a20ce5cb4e510a5e4600a5
2014-03-10 11:27:23 -04:00
Samuel Merritt
f19ccb6359 Take tempurl out of Swift pipeline additions
Swift commit 165dd44 added tempurl to the sample config, so now it
appears twice in the default devstack-installed configuration. This
commit removes tempurl from $SWIFT_EXTRAS_MIDDLEWARE so that it only
appears once in the generated proxy pipeline.

Change-Id: I4204b2a444312ab87c17f5fb296a43818a4528a6
2014-03-10 13:12:55 +01:00
Jenkins
111f0f1bd9 Merge "Add heat_stack_owner role for heat trusts usage" 2014-03-08 18:12:49 +00:00
Jenkins
c6fc45582c Merge "Put tempest ipv6 option in the correct group" 2014-03-08 15:26:35 +00:00
Jenkins
b28103b2e8 Merge "Make stop_swift() more robust for Grenade" 2014-03-08 15:26:33 +00:00
Jenkins
e0ec5cce44 Merge "Add an ability to configure debug-level for ceilometer" 2014-03-08 15:26:31 +00:00
Jenkins
a6863b346c Merge "Add support for sqlalchemy to Marconi" 2014-03-08 13:25:15 +00:00
Jenkins
fb166c3d97 Merge "Fix errexit in lib/ldap" 2014-03-08 12:55:58 +00:00
Jenkins
fa210d2ab6 Merge "make compute-admin correct" 2014-03-08 01:46:55 +00:00
Jenkins
da6831200b Merge "Iniset keystone auth version" 2014-03-08 01:46:33 +00:00
Jenkins
54331b51e7 Merge "Add support for configuring OVS to work with OpenDaylight" 2014-03-07 18:53:58 +00:00
Sean Dague
e530ba30a6 make compute-admin correct
we lost the admin tenant at some point in the last couple of
days which disabled 500 tempest tests. Bring this back.

Change-Id: I5cab2074777cab99982ae8fc4a83663e9d128284
2014-03-07 07:55:46 -05:00
Andrea Frittoli
07f1d0ef3d Iniset keystone auth version
Introduces support for suth_version config flag in lib/tempest.
The variable is named TEMPEST_AUTH_VERSION, and it can be set
via localrc, so that the devstack-vm-gate-wrap may control it.

The aim is to setup a keystone v3 based experimental check
job in tempest experimental pipeline.

Partially implements bp multi-keystone-api-version-tests

Change-Id: Ia6832d87308c6c7109e6ae0dbd8dff61134718ee
2014-03-07 07:53:37 +00:00
Jenkins
6756c697d2 Merge "Inject all account details in tempest.conf" 2014-03-07 01:54:32 +00:00
Jenkins
c880fb41b0 Merge "Fix marconi's storage setting for MongoDB" 2014-03-06 21:03:24 +00:00
Jenkins
82660c6914 Merge "Move heat keystone setup into lib/heat" 2014-03-06 20:54:19 +00:00
Dean Troyer
1eae3e155a Make stop_swift() more robust for Grenade
stop_swift() wasn't calling screen_stop() so the pid files and screen
sessions were not being cleaned up.  DevStack doesn't really care but
Grenade does for the 'base' copy of DevStack.  This should be backported
to stable/havana for this reason.

Change-Id: Ib5afb321cef2b7ad74e69a3fd0d1dad469f78b11
2014-03-06 11:49:30 -06:00
Dean Troyer
b44a8ef14f Fix errexit in lib/ldap
clear_ldap_state() deletes an object from the DIT that doesn't exist
on the first run, this is OK but fails with errexit enabled.

Change-Id: I3b881eedc891caa6b2dfd5913e43f3babcfa7d47
2014-03-06 11:25:08 -06:00
Jenkins
3a07906d90 Merge "Use cat instead of read<file" 2014-03-06 16:24:12 +00:00
Kyle Mestery
d44517dfcf Add support for configuring OVS to work with OpenDaylight
This adds support for running OpenDaylight as an OpenStack Neutron plugin
under devstack. This entails downloading the latest version of OpenDaylight,
configuring it, and running it as a service under devstack. This code also
includes pieces which configure Open vSwitch on each devstack node to point
at OpenDaylight as their OpenFlow and OVSDB control interface. This is
required for compute hosts, which will not be running any Neutron software
on them at all. This post-devstack configuration is handled in the extras
directory because of the fact there is no Neutron code running on the compute
hosts themselves.

Closes-bug: #1273917

Change-Id: I696e7c7fe63c835f90c56105775def305a702877
2014-03-06 16:19:10 +00:00
Jenkins
a8f195b96a Merge "Fix typo in ironic configure function" 2014-03-06 16:17:27 +00:00
Nadya Privalova
423d7901a4 Add an ability to configure debug-level for ceilometer
Change-Id: Ibe9dd2391202a5af291d2eed1559bae60370f9a8
2014-03-06 15:16:42 +04:00
Jenkins
f0d3027500 Merge "NCCLIENT_REPO is using the wrong url" 2014-03-06 03:20:54 +00:00
Andrea Frittoli
d46d9dd8de Inject all account details in tempest.conf
The tempest configuration function did not inject all account
details in tempest.conf. The only reason why it worked, was
because tempest uses default config values which are valid for
the current devstack setup.

To remove this dependency, two patches are needed:
- this one in devstack, to inject all values
- https://review.openstack.org/#/c/77602/ in tempest, to change
  default values to None

Partially fixes bug 1287191

Change-Id: I01507b142703a1ff66707464b9a743e9d0ca3e01
2014-03-05 22:57:52 +00:00
Flavio Percoco
5fc5b7e231 Add support for sqlalchemy to Marconi
This patch adds a way to setup a marconi instance using sqlalchemy.

Change-Id: Ia694b76286835ca2ca935814370aa43544fe84fa
2014-03-05 21:14:46 +01:00
Flavio Percoco
961328fc46 Fix marconi's storage setting for MongoDB
The storage driver should be set to mongodb and the driver's uri to the
mongodb:// uri.

Change-Id: I6193a5d78f6cd7283b4e3b1831978883b9e99b06
2014-03-05 21:13:53 +01:00
Jenkins
4981bd7532 Merge "fix tgt to use 'service' instead of upstart calls" 2014-03-05 14:21:10 +00:00
Malini Kamalambal
e2aa91b237 Enable marconi-server to run when USE_SCREEN=false
This patch,
1. adds log_file option to marconi.conf
2. redirects the output from marconi-server, in the same precedent
set by another project.

Change-Id: Ib273a03625d5a4edf8bb3ed7d522d2b087975acd
2014-03-04 16:26:20 -05:00
Sean Dague
b9a7035081 fix typo in lib/ceilometer
this should be is_service_enabled and not service_enabled. Not
sure why it passes in the gate, but it fails in stackforge jobs.

Change-Id: I876f72cd98ff9c8e4ea28832bc9ac6bbdc3b865d
2014-03-04 15:02:04 -05:00
Eric Windisch
3d2bdf50bc Use cat instead of read<file
When reading a file, it is expected that
the read process will exit 1 as this is
expected whenever the input reaches an EOF.

Because it is not clear if the 'exit 1' is
from a successful read or a more serious error,
and as this edge-case of 'read' is not well-known,
we instead change this code to read the file using
'cat'.

The new code is moved into a function, is_docker_running.

Furthermore, we now quote the variables and check
for the existance of the pid file for better and safer
error handling.

Change-Id: Idb56b87349a5a84d5d255715cfb7191341363118
Closes-Bug: 1286441
2014-03-04 12:48:45 -05:00
Alexander Gordeev
a67cb1af4d Fix typo in ironic configure function
IRONIC_CONF should be replaced by IRONIC_CONF_FILE

Change-Id: Ie43e376f42f14c46d21df7dbb19db923521f438b
2014-03-04 18:39:07 +04:00
Sean Dague
d5b52ca755 fix tgt to use 'service' instead of upstart calls
the comments in here were largely about oneric, which we don't
support any more. service is installed in a precise environment,
and will support debian and the upcoming transition to systemd
better, so use that instead.

Change-Id: If15493549a8c93a7387df9b3bba31443aed46995
2014-03-04 09:23:07 -05:00
Matthew Treinish
ccf60f75a2 Put tempest ipv6 option in the correct group
This commit updates the location for the ipv6 option to be in the
proper group. This depends on tempest change
I35769cf4d18363fad56ed5150b4d01d8a5ad17e7

Change-Id: Ief5ea00649c8954282245e30c63c45557a28ea9f
2014-03-03 22:50:40 -05:00
Jenkins
9f935cbd4a Merge "devstack (stack.sh) fails when extra config files are specified" 2014-03-04 01:13:06 +00:00
Jenkins
a98721da9c Merge "Add configurations for the OpenFlow Agent mechanism driver" 2014-03-04 01:05:25 +00:00
Jenkins
6751ed504c Merge "Remove bm_poseur, unmaintained and obsolete" 2014-03-04 00:57:01 +00: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
Steven Hardy
2ca3bf18dd Add heat_stack_owner role for heat trusts usage
Heat supports deferred operations via keystone trusts,
and we'd like to make that the default.  To do this, we
require a new role, which is the default role specified
in heat.conf trusts_delegated_roles, heat_stack_owner.

Add the role to the admin/demo users so they can create
heat stacks when we make deferred_auth_method=trusts the
default.

Change-Id: Idfc70ee89428c23f5965e643486ff2ad9566471c
Related-Bug: #1286157
2014-03-03 18:18:43 +00:00
Steven Hardy
57d478d874 Move heat keystone setup into lib/heat
Move the heat setup which currently happens in files/keystone_data.sh
to lib/heat, where we have create_heat_accounts.

Move the user, role, service and endpoint creation as that is consistent
with what other services, e.g lib/nova are doing.

Change-Id: Iaa2c822cad581d6b2b4f22f8863daf81e25f8485
2014-03-03 18:18:28 +00:00
Jenkins
bd9dbef932 Merge "use "rabbit_hosts" config option instead of "rabbit_host"" 2014-03-03 16:43:05 +00: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
fe09741e14 Merge "only do a dbsync if on the database node" 2014-03-01 18:54:57 +00:00
Jenkins
3de8607a4c Merge "Replace NvpPluginV2 with NsxPlugin" 2014-03-01 18:40:41 +00:00
Jenkins
f020c9aa6b Merge "make ceilometer work if you don't enable ceilometer-api" 2014-03-01 17:20:31 +00:00