199 Commits

Author SHA1 Message Date
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
Jenkins
80c3ea52ed Merge "exit cleanup in functions" 2013-10-22 21:33:39 +00:00
Sean Dague
537d4025c5 whitespace cleanup on functions & lib/config
fix some of the bash8 issues found in functions and lib/config,
part of the long march towards fixing all the bash8 issues.

Change-Id: Ia131f64870acb0f9d196fe1a9a45d633abb6fc4d
2013-10-22 12:59:22 -04:00
Jenkins
92a864737e Merge "./stack.sh complain no /etc/nova/nova.conf" 2013-10-22 14:02:59 +00:00
Sean Dague
dc30bd3eb4 exit cleanup in functions
we should always use die instead of exit so that we know why we
failed.

Also remove instances where exit is called after die, as that is
a noop.

Change-Id: I8e08cce63d35c503c36ff1e09805f3db427d082d
2013-10-22 07:32:04 -04:00
DennyZhang
f43f3a59c2 ./stack.sh complain no /etc/nova/nova.conf
If nova.conf doesn't exist, mute error generated by grep.

Closes-Bug: #1239044

Change-Id: Ia497e2a9d8395cc11850fb16fd4075af9855b2a5
2013-10-20 09:49:52 -05:00
Jenkins
afcb049c7c Merge "Remove general assumption in get_packages()" 2013-10-16 21:13:51 +00:00
Jenkins
c5a1b05eba Merge "Add meta-config via local.conf" 2013-10-14 17:49:26 +00:00
DennyZhang
b5e11ff874 fix typo in functions
Change-Id: I0d09d6d4f4405d3dc96f7a9eed62f87e5d3f8bc1
2013-10-14 00:53:46 -05:00
Dean Troyer
893e66360c Add meta-config via local.conf
This defines a new local.conf file that is designed to take the place of all
of the 'pass-through'[1] configuration options that have been defined in DevStack.

* new local.conf file can contain multiple config file settings to be
  merged in to existing project config files
* localrc can be embedded into local.conf and will auto-extract if
  localrc does not exist
* Adds functions get_meta_section(), get_meta_section_files(),
  merge_config_file() and merge_config_group()
* Adds EXTRA_OPTS, EXTRA_BAREMETAL_OPTS, Q_DHCP_EXTRA_DEFAULT_OPTS and
  Q_SRV_EXTRA_DEFAULT_OPTS to the deprecated warning list at the end of stack.sh

[1] Pass-through options are those that do not configure or change DevStack's behaviour
but simply set a value in a project config file.  This includes most of the EXTRA_XXX_OPTS
configuration variables.

Change-Id: I367cadc86116621e9574ac203aafdab483d810d3
2013-10-11 11:41:58 -05:00
Jenkins
125c29f99e Merge "Fix typo in property passed to glance" 2013-10-06 08:42:08 +00: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
Jenkins
2671a8b97e Merge "Fix handling of pip and virtualenv on openSUSE" 2013-10-04 18:37:30 +00:00
Dean Troyer
ca5af8615e Remove general assumption in get_packages()
get_packages() always included 'general' as a default 'service' file.
Remove this assumption and add it explicitly to the primary package
installation call.  This allows get_package() to be used in other places
where 'general' is not desired to be included.

Change-Id: I1eed4386d073d6ae9534aedae32654208c6662e8
2013-10-04 13:33:10 -05:00
Ryan Hsu
49f4486f1c Fix typo in property passed to glance
In the upload_image function, a property that is passed to glance in
the vmdk conditional block has a typo. Changes "vmware-disktype" to
"vmware_disktype" (dash to underscore)

Change-Id: I6c4e1875b6ab4544f9742ab08893dae0e86965a0
Closes-Bug: #1235080
2013-10-03 22:29:52 -07:00
Adam Spiers
6d8fce7325 Fix handling of pip and virtualenv on openSUSE
openSUSE's python-virtualenv rpm depends on the python-pip rpm, but
tools/install_pip.sh prefers to deinstall the latter (if installed) and
install pip directly from upstream source instead.

This deinstallation of python-pip will break if attempted via rpm -e,
since rpm does not transitively remove dependents (in this case
python-virtualenv).  In contrast, "zypper rm" does, so we switch to
that.

It is safe to remove the python-virtualenv package, since stack.sh will
install virtualenv via pip instead.

Change-Id: I5bc23de0f2de2e3940c4be3b76b7c0634836239b
2013-10-01 18:07:39 +01:00
Mehdi Abaakouk
aee9412b4b Allow openrc to be loaded in zsh
This fix the test then detect OSX in GetOSVersion that break support of zsh.

Fixes bug #1233118

Change-Id: If243fbe59f8f08041327057425018d7ae0d13ab2
2013-09-30 14:04:11 +02: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
Jenkins
f20859b435 Merge "Normalise RECLONE flag to True Or False." 2013-09-29 12:30:48 +00:00
Jenkins
d76b11f56e Merge "change git show to | head -1" 2013-09-26 04:54:57 +00:00
Jenkins
0c43c6a7b8 Merge "Clean up automated changes to requirements" 2013-09-25 17:12:13 +00:00
Sean Dague
45a21f0e54 change git show to | head -1
git show uses default system pager, which for people that have
funky pagers, goes sideways. Pipe this through head -1 to ensure
we only get the single change line we care about.

Change-Id: Iff22612b555bf58fe12101701cfe593f37e8f8de
2013-09-25 10:27:27 -04:00
Jenkins
5a9609bed3 Merge "make git show not display a diff" 2013-09-25 13:22:04 +00:00
Sirushti Murugesan
a8d41e3af7 Normalise RECLONE flag to True Or False.
RECLONE flag now uses function trueorfalse for flag handling.
Added more flag cases to normalisation function trueorfalse.

Fixes bug #1200382

Change-Id: I0738537c87634281c6a92fa93b7f84a6b0dad497
2013-09-25 13:34:09 +05:30
Jenkins
23033e0399 Merge "Colorize Neutron log output and refactor log setup code" 2013-09-24 21:59:07 +00:00
Sean Dague
06d17eb54a make git show not display a diff
if the top commit includes actual content, this was being displayed
in the devstack log, which was just confusing. --quiet suppresses
this.

Change-Id: Id52604d3b2b9a1372746120cb5d8d741c35576b7
2013-09-24 07:06:16 -04:00
Doug Hellmann
c3431bfdd9 Clean up automated changes to requirements
Some of us like to reuse sandboxes, and keep them up to date.  This
is very difficult to do if devstack leaves modifications to
requirements.txt files after a run, since 'git pull' may refuse to
overwrite those changes.

This modification has devstack undo the changes to the requirements
files, to leave the sandbox in a clean state again.

Change-Id: Ia2d928ade8141b59b56a2c4548d760bf6911a3e5
2013-09-23 17:14:49 -04:00
Sean Dague
835db2fead print out git references for trees
in order to be sure we understand the environment that's running
in an upstream test, print out the git information for the tree.
This will hopefully address questions of "which commit of tempest"
is being used for particular tests.

Change-Id: Ief4e8a17fd75945f02982d2adf8625fe927d823d
2013-09-23 14:19:45 -04:00
Jenkins
b305eeea1b Merge "Only run chmod/chown for local files" 2013-09-15 14:05:25 +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
Jenkins
abd1f24dd6 Merge "Added Trove (Database as a Service)." 2013-09-12 22:42:18 +00:00
Nikhil Manchanda
0cccad43aa Added Trove (Database as a Service).
- Added changes to stackrc for the Trove Repos.
- Added support to devstack for "install", "configure",
  "init", and "run"

implements blueprint:trove-devstack-integration

Change-Id: Ib3f6daad33e629f764a174b80762c808ce8588e2
2013-09-11 23:48:07 +00:00
Doug Hellmann
e700267e33 Only run chmod/chown for local files
When the /opt/stack directory is NFS mounted, chown to
the local user might not work. Create safe_chown and
safe_chmod functions that do nothing on NFS filesystems
to avoid spurrious errors.

Change-Id: Iaa68879e867a4426b1990d4d46164769177dc7cc
2013-09-10 15:15:58 -04:00
Ryan Hsu
a6273b9378 Provide a means of setting vmdk custom properties via image filename
Custom properties for vmdk disk type, storage adapter type, and
networking adapter type can now be retrieved from a vmdk image's
filename. The filename format is defined as:

  <name>-<disk type>:<storage adapter>:<network adapter>

An example filename following this format would be
debian-2.6.32-i646-thin:ide:VirtualE1000. If the vmdk filename does not
match the above format then underlying nova driver will supply default
values.

Change-Id: I83483d20f984250bd8154d8e270b2e801d2df303
Closes-bug: #1221044
2013-09-05 16:49:20 -07:00
Jenkins
53d5b791fd Merge "Copy policy_add() from Grenade functions" 2013-09-04 16:47:04 +00:00
Dean Troyer
533e14d6a5 Copy policy_add() from Grenade functions
policy_all() was added to Grenade's functions file, which is notmally synced
from DevStack so we need to bring it over here before the next sync.

Change-Id: Ifd852e9d1ffe39fa23f6312d1ddf2874b5f2b9f0
2013-09-03 14:19:32 -05:00
Mate Lakat
1533a349da remove multi-host timeout
If you ran exercises with MULTI_HOST enabled, an additional sleep was
performed. This change removes that sleep to speed up tests.

Change-Id: I9dfd61cbb9415bd5e8fd1e40f4e41512be2ae0d2
2013-08-30 14:10:52 +01:00
Jenkins
5584709fa8 Merge "Fix is_package_installed() check with dpkg" 2013-08-29 04:51:52 +00:00
Jenkins
bc11e0a0bc Merge "xenapi: devstack support for raw tgz image upload" 2013-08-29 02:17:23 +00:00
Jenkins
666fe5fd9f Merge "Adds new tag for testonly packages in package lists" 2013-08-29 01:17:45 +00:00
Dean Troyer
04762cd823 Fix is_package_installed() check with dpkg
is_package_installed() incorrectly returned '0' for packages that
had 'un' status in the dpkg database.

Change-Id: I81b77486c2ed7717ed81cb2c2572fe6c4b394ffc
2013-08-27 17:48:49 -05:00
Mate Lakat
bc2ef929ed xenapi: devstack support for raw tgz image upload
Devstack will recognise the .xen-raw.tgz extensions, and upload them to
glance as raw tgz images with xen pv_mode. This change also adds "tgz" to
the recognised container formats of glance. The changes for raw tgz
support are:

    https://review.openstack.org/#/c/40908/
    https://review.openstack.org/#/c/40909/
    https://review.openstack.org/#/c/41651/

related to blueprint xenapi-supported-image-import-export

Change-Id: I077564587d4303291bb4f10d62bb16380b574106
2013-08-27 11:12:28 +01:00
Christian Berendt
71d5630c4a Adds new tag for testonly packages in package lists
Also introduces a new parameter INSTALL_TESTONLY_PACKAGES
in the stackrc with False as default value. Setting it to
True stack.sh will install all packages tagged with the tag
testonly in the package lists.

Includes needed packages for Ubuntu and Fedora

fixes bug #1203680

Change-Id: I911a6601819a34262853bba0658f6751148bfbec
2013-08-21 14:15:20 -05:00
Jenkins
68044c0245 Merge "Redirect dpkg -l stderr to /dev/null" 2013-08-20 04:01:32 +00:00
Clark Boylan
41815cdc7b Echo service start failures.
* functions: Previously screen_it would log service start failures by
touching a file, this isn't very useful when working with Jenkins.
Switch to echo'ing that a service failed to start and pipe that through
tee so that we can keep the old behavior of touching a file (note this
behavior is slightly modified and the touched file will now have
contents).

Change-Id: I2d3f272b9a65a9d64dbbc01373a02fccf52f56a8
2013-08-16 14:57:38 -07:00
Jenkins
4a5963f2fe Merge "Added functions for get a ip on an instance" 2013-08-16 02:55:11 +00:00
Jenkins
af1c7f564e Merge "Add XenServer to GetDistro's logic" 2013-08-15 16:13:47 +00:00
Nachi Ueno
6769b166b1 Added functions for get a ip on an instance
The cause of some gating failure looks like
because of getting ip address on instance.
However current exercise didn't log the return value.
In this commit, we add get_instance_ip function with
error hanlding support, and apply it on the execise.

Change-Id: I8e17ba68093faafe58a98eb780a032368eea38aa
2013-08-13 17:08:47 -07:00
Bob Ball
4669122dc8 Add XenServer to GetDistro's logic
This is primarily to satisfy the expectations of various scripts that os_*
variables are defined, and will result in a distro similar to "xs6.1.0-59235p"

Fixes bug 1211001

Change-Id: I951e1eb3a5e25f4d8773a11b15cf38157b6492fe
2013-08-13 21:51:41 +01:00