221 Commits

Author SHA1 Message Date
Dean Troyer
2ac8b3f3c2 Fix a couple of INI whitespace bugs
* iniset() bails if no section or option (attribute) is supplied
* merge_config_file() properly skips lines with only whitespace

* Also split the ini-tests into their own script

Bug 1257954

Change-Id: Ie31c5bd0df8dfed129fbcf1e37228aaf25e9305d
2013-12-09 10:30:02 -06:00
Jenkins
b20d4d124e Merge "Generate glance image with SCSI bus type for ppc arch" 2013-12-05 18:02:04 +00:00
Rafael Folco
ab77587a37 Generate glance image with SCSI bus type for ppc arch
This patch fixes wrong assumptions for bus types of disk and cdrom
on ppc64. Qemu driver assumes IDE bus type for cdrom device, which
is not supported on ppc arch.
Adds capability to add --property key-value to the glance
image-create command.
Using double brackets for portability reasons.

Change-Id: I9f55fa0b6a894a93926e4f8c3d0ea410b5283f9c
2013-12-04 16:52:31 -02:00
Arnaud Legendre
90bcd2ff4d Attempt to retrieve the vmdk descriptor data-pair
VMDK formats such as monolithicFlat and vmfs require two files to be
fully consumable by the Nova drivers (a descriptor-data pair: *.vmdk and
*-flat.vmdk).
On the upload of the descriptor (*.vmdk), upload_image.sh should attempt to
retrieve the *-flat.vmdk. The same way, the descriptor should be
retrieved when a flat disk is uploaded.
On success, the upload script will be able to use the flat disk as the image
content and the relevant descriptor settings as the image metadata.

Change-Id: I9214754029c46dd60b9e7d606d84d8819a498a8d
Closes-Bug: #1252443
2013-12-03 17:57:24 -08:00
Jenkins
1fe3fc0457 Merge "Update vsphere image filename pattern" 2013-11-22 16:19:01 +00:00
Jenkins
202677ae30 Merge "Fix stackforge_libs installation step" 2013-11-22 09:58:08 +00:00
Jenkins
429b64e4a5 Merge "upload_image.sh should handle file URLs" 2013-11-22 03:02:08 +00:00
Jenkins
921c508027 Merge "Enable/disable ironic in tempest config" 2013-11-21 21:08:30 +00:00
Ryan Hsu
bfb3e5ec9c Update vsphere image filename pattern
The vsphere image filename pattern has been updated so that semi-
colons are used to delimit image properties rather than colons,
which are not permitted in Windows filesystems. To support back-
wards compatibility, colons can still be used.

Change-Id: I29a3ac03dcae294326dc8813a66512a79f705f81
Closes-Bug: #1250319
2013-11-19 20:54:23 -08:00
Doug Hellmann
aaac4eede9 Fix stackforge_libs installation step
When stackforge_libs is enabled, the WSME and Pecan libraries
are checked out from stackforge and installed from source instead of
pip. This change introduces a new function to perform the installation
without attempting to sync the global requirements list, since the
version of setup.py in the global requirements repository breaks the
dependencies for WSME (there is no ipaddr library in python 2, so we
need to install it, but under python 3 where it is part of the stdlib we
cannot include it in the requirements).

Fixes bug 1252488

Change-Id: I58357757ac67a919bf70178b76f65fa0a9e16242
2013-11-18 22:16:45 +00:00
Arnaud Legendre
3e439448b5 upload_image.sh should handle file URLs
upload_image.sh doesn't handle correctly file URLs: a file URL works only
if the file is already in the cache.
This patch provides support for file URLs of local files (RFC 1738)
http://tools.ietf.org/html/rfc1738

Change-Id: I107299c543cfa189e32848c32eefdbeb51a5e1f5
Closes-Bug: #1251752
2013-11-15 16:16:17 -08:00
Jenkins
80798bf56d Merge "Use vmdk descriptor to populate image properties" 2013-11-15 18:45:11 +00:00
Roman Prykhodchenko
d005959552 Enable/disable ironic in tempest config
In order to run tempest tests for Ironic in devstack
the availability of the Ironic service must be set in
the tempest config.

This patch adds a shortcut for Ironic services and sets
availability of Ironic in tempest config.

Change-Id: I206fc2ea13412ceb128f8bfe90c153348d6f2f3e
2013-11-14 09:58:53 +02:00
Arnaud Legendre
5ea53ee5f7 Use vmdk descriptor to populate image properties
image_upload.sh doesn't use the descriptor properties embedded inside
the vmdk file. This requires the user to manually change the filename of the
vmdk file to add the properties (disk type, storage adapter and network
adapter).
In case of a sparse monolithic sparse or stream-optimized sparse, these
properties are extracted from the descriptor.
The user can still override these values by modifying the filename.

Change-Id: I1734311c66efe60a1a30e3ea63cc2a9da9cdb5b4
Closes-Bug: #1247300
2013-11-12 15:45:53 -08:00
Jenkins
26e0a05a90 Merge "Fix horizon config under Apache 2.4" 2013-11-11 22:20:08 +00:00
Chris Buccella
610af8cfa7 Fix horizon config under Apache 2.4
Apache 2.4 now uses mod_authz_host for acces control. Horizon's
Apache config needs an update to allow access to its directory,
otherwise a 403 will be returned.
This change replaces a similar previous fixes done for Fedora 18
and Ubuntu 13.10, since this is an Apache version issue, not a
distro-specific one.

Change-Id: Iecc17600d8e1aae6a7b0929b1493d712c307616f
Closes-Bug: #1243075
2013-11-05 13:06:34 +00:00
DennyZhang
89d41ca239 Fix wrong variable comparision in functions
A whitespace is missing.
Closes-Bug: #1247273

Change-Id: I4bbed6077813c5d7522650baf2e78d9c44c1bba4
2013-11-01 15:41:23 -05: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
Sean Dague
fd98edb469 create an UNDO_REQUIREMENTS variable
in the gate, we actually need to *not* roll back the requirements,
otherwise tempest can wedge the world because it runs under tox.

Make a variable that we can set to false in the gate to ensure that
we don't roll back the requirements changes.

Change-Id: I2b842ecc3f6e8b917dd721729640000bd7e7fb78
2013-10-24 15:09:47 -04:00
Jenkins
0c42f25043 Merge "Just reset the repo instead of trying to co files" 2013-10-24 16:48:54 +00: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
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
Chmouel Boudjnah
cbce1fa418 Just reset the repo instead of trying to co files
We can just reset the repo instead of trying to checkout specific files.
This fix external repos which doesn't not have requirements.txt or
test-requirements.txt.

Closes-Bug: 1231334
Change-Id: Iab898f5e8a422cc0cbfe44839c938f22c7525fd8
2013-10-17 11:43:48 +00: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