22 Commits

Author SHA1 Message Date
Chris Dent
2f27a0ed3c Replace screen_it() with run_process() throughout
run_process will use screen if USE_SCREEN=True (the default),
otherwise it will simply start the requested service. Therefore
wherever screen_it used, run_process can be instead.

Where stop_screen was found it has been replaced with stop_process.

A tail_log function has been added which will tail a logfile in a
screen if USE_SCREEN is True.

lib/template has been updated to reflect the use of the new
functions.

When using sg the quoting in run_process gets very complicated.
To get around this run_process and the functions it calls accepts
an optional third argument. If set it is a group to be used with sg.

Change-Id: Ia3843818014f7c6c7526ef3aa9676bbddb8a85ca
2014-09-11 18:59:39 +01:00
Jenkins
711a4d2ff7 Merge "Install ryu's requirements" 2014-06-19 22:49:50 +00:00
Gabriel Assis Bezerra
a688bc6510 Fix the way Apache site configuration files are used, to improve OS portability
On Ubuntu 14.04, the site configuration file must have a .conf suffix for a2ensite and a2dissite to
recognise it. a2ensite and a2dissite ignore the .conf suffix used as parameter. The default sites'
files are 000-default.conf and default-ssl.conf.

On Ubuntu 12.04, the site configuration file may have any format, as long as it is in
/etc/apache2/sites-available/. a2ensite and a2dissite need the entire file name to work. The default
sites' files are default and default-ssl.

On Fedora, any file in /etc/httpd/conf.d/ whose name ends with .conf is enabled.

On RHEL and CentOS, things should hopefully work as in Fedora.

This change puts all distribution-related site configuration file name differences in lib/apache and
the other services gets the file name for its sites using the new exported function
apache_site_config_for <sitename>.

It also makes Fedora disabled sites use the .conf.disabled suffix instead of removing the .conf from
the file name.

The table below summarizes what should happen on each distribution:
+----------------------+--------------------+--------------------------+--------------------------+
| Distribution         | File name          | Site enabling command    | Site disabling command   |
+----------------------+--------------------+--------------------------+--------------------------+
| Ubuntu 12.04         | site               | a2ensite site            | a2dissite site           |
| Ubuntu 14.04         | site.conf          | a2ensite site            | a2dissite site           |
| Fedora, RHEL, CentOS | site.conf.disabled | mv site.conf{.disabled,} | mv site.conf{,.disabled} |
+----------------------+--------------------+--------------------------+--------------------------+

Change-Id: Ia2ba3cb7caccb6e9b65380f9d51d9d21180b894e
Closes-bug: #1313765
2014-05-30 12:07:24 +00:00
YAMAMOTO Takashi
f12a434bbf Install ryu's requirements
Install packages ryu requires explicitly becuase they are
no longer covered by neutron's requirements.
(They used to be until very recently.)

Closes-Bug: #1323136
Change-Id: I6a603d95c053ac1deba59d8e479dbaf1a70293f3
2014-05-26 11:34:02 +09: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
YAMAMOTO Takashi
0e598c3c81 Stop running setup_devel for Ryu
It doesn't work here for various reasons.
- Ryu's setup.py is incompatible with global requirements
- This code is called before install_infra.

Ryu is not a part of OpenStack anyway.

Closes-Bug: 1287569
Change-Id: I01a942411f7d06bdf8f1fec5d1a0bc319560f329
2014-03-04 16:39:59 +09: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
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
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
db20cd5436 Add Neutron/NSX plugin sanity check
Supports-blueprint: nvp-third-party-support (aka bp vmware-nsx-third-party)
Related-bug: #1265671

Change-Id: Ifa4e1d36b8735e81f24b8852103a9c433d736e84
2014-01-25 09:05:01 -08: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
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
Yuiko Takada
74ba66dd3f Fix the option of a2ensite command
devstack fails with trema when  execute
"sudo a2ensite sliceable_switch" command, without ".conf" filename extension
with Apache2.4, Apache2.22. With Apache 2.2, it successes.
Because in the versions which newer than version 2.2,
file checking of a2ensite command is more severe.
So, a2ensite command forbid "sliceable_switch" without "/conf".

Added ".conf" filename extension.

Change-Id: I29a03cb59ee493345b7df0f1a9189eb3516c86e2
Closes-Bug: #1263017
2013-12-20 11:10:00 +00:00
Jenkins
5fc612bbf2 Merge "Default to /24 prefix for floating IP range with neutron" 2013-12-17 09:08:59 +00: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
armando-migliaccio
19a47a49a9 Neutron/NVP plugin: fix 'ip link' usage
Closes-bug: #1258141

Change-Id: Id26eca6c3174a108d1822440956ab7f66cc3ebd3
2013-12-10 14:14:07 -08: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
101b424842 fix whitespace in the rest of lib/*
this brings this in line with bash8 checker

Change-Id: Ib34a2292dd5bc259069457461041ec9cd4fd2957
2013-10-22 13:02:23 -04:00
Salvatore Orlando
9732b57e3d Nicira plugin: do not die if NVP gateway IP is missing
Devstack should not die if the IP and prefix len for establishing
a connection to the public network are not provided.
In this case, the public gateway IP address used to configure
Neutron's public network should be used, together with the prefix
length of the public network's CIDR.

This patch also ensures $PUBLIC_BRIDGE is created, even if
Q_USE_DEBUG_COMMAND is disabled. Finally this patch also adds
the teardown operation for restoring the original IP addresses
on the interface used for connectivity to the public network
implemented on the NVP gateway.

Bug #1227750

Change-Id: Ib58738a578c46f2183d503cabfdc6039bfbeb702
2013-10-09 02:36:32 -07: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
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
Mark McClain
b05c876994 update for name change to Neutron
Note: Nova and Horizon are not updated until those projects have
migrated.

Change-Id: I256ef20e7caadd9c96e6dd908c5d8b69ca5c4aeb
2013-07-07 00:15:11 -04:00