4236 Commits

Author SHA1 Message Date
Dean Troyer
444a8d53ca Fix Apache site config handling on Fedora
Allow enable/disable_apache_sites() on Fedora to gracefully fail if the
config is not present.  This is primarily an issue when the config from
a previous run is not completely cleaned out (unstack.sh vs clean.sh).

Make APACHE_CONFIG_DIR fully qualified and overrideable in local.conf.

Also fix Horizon's handling of its Apache config file to be removed
in clean.sh.

Change-Id: I78a5de579dd3b02fa2e4e7e00ac0aabe71b531ad
2014-06-06 16:52:20 -05:00
Attila Fazekas
afda4efb2c Enable horizon on Fedoras
The previous apache/horizon a688bc65104e7d8998ffdb321d67a9f33df6997e
change left horizon disabled on Fedora.

Closes-Bug: #1326126

Change-Id: I79f84bb63471f84c6b37538e8dfe2bcca3ce3eac
2014-06-04 07:34:13 +02:00
Jenkins
ea937baee6 Merge "Fix the way Apache site configuration files are used, to improve OS portability" 2014-06-03 03:16:08 +00:00
Jenkins
142adec5d6 Merge "Remove copy of cinder.conf.sample file" 2014-06-02 22:45:07 +00:00
Jenkins
47ae725f13 Merge "be a little more clever about interface default" 2014-06-01 09:39:52 +00:00
Jenkins
14916d4c54 Merge "Create an IPv6 network that uses an external router for IPv6" 2014-05-30 18:16:36 +00:00
John Griffith
55c0b225e2 Remove copy of cinder.conf.sample file
Rather than continue to be bit by conf updates
from external sources, Cinder is going to join
the party and cease generation of the sample.conf
as part of the unit tests.

First step however is to not attempt to copy it
from cinder/etc/cinder in the devstack setup.

This just removes that cp operation, nothing
in that sample conf was modfied from defaults
so it wasn't really doing anything anyway.

Change-Id: I727b1747ff36d775ef881e93e3b9a8528a17a4df
2014-05-30 15:46:13 +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
Jenkins
ced4ba63cd Merge "Add support for creating provider networks" 2014-05-30 03:49:00 +00:00
Jenkins
3a15ccdd54 Merge "Update readme.md, heat is now enabled by default" 2014-05-30 02:52:09 +00:00
Sean Dague
1100717753 be a little more clever about interface default
the interface default of eth0 has become more wrong since we've
got a generation of Linux distros that don't use eth* as their
interface naming. Instead of that do a slightly more clever, but
probably still wrong thing, of picking an interface that exists
and is a physical interface.

This is still overridable, however won't cause really cryptic
failures in nova-compute because it's trying to use an interface
that doesn't exist *really* late in the network creation.

Change-Id: I93016ff5a25678de76254418155c839a269486a0
2014-05-28 17:30:10 -04:00
Chris Dent
a0ced4df00 chown stack/data/nova/networks to $STACK_USER
$USER may be undefined (resulting in an error exit from stack.sh)
or may be the current $USER rather than the target $STACK_USER
(which may or may not be the same) which could lead to errors
later.

This change brings about consistency: the rest of stack.sh always
uses $STACK_USER.

This same problem may be present in lib/marconi.

Change-Id: Idff2bee88de4e1da11cd5765a03646caf3ede24f
2014-05-27 22:18:21 +01:00
JordanP
97eb9bbec6 Update readme.md, heat is now enabled by default
Change-Id: Ia36879711aa440f4fba657159afeba2105c6aae4
2014-05-26 09:38:50 +02:00
Jenkins
1e6e4289bc Merge "Fix syntax error in script" 2014-05-25 13:32:04 +00:00
Malini Kamalambal
22ab3b9f31 Fix syntax error in script
One of the recent patches introduced a syntax error in the marconi
script. This patch fixes the issue & gets marconi running in
devstack again.

Change-Id: I46a039f72174c4898869983de03a1e29cbe435bf
2014-05-22 16:26:25 -04:00
Jenkins
5069ae9eef Merge "Add oslo.db" 2014-05-22 19:29:17 +00:00
Jenkins
e95a13f750 Merge "Fix notify_nova options" 2014-05-22 19:27:39 +00:00
Jenkins
0cf98966fd Merge "Add support for the IPv6 extended attributes in Tempest" 2014-05-22 18:09:19 +00:00
Jenkins
eccd8952f7 Merge "Revert "ceilometer.conf configuration option missing os_auth_url"" 2014-05-22 18:09:12 +00:00
Jenkins
2109d74db5 Merge "Fix getting EC2 and S3 urls in create_userrc" 2014-05-22 18:04:54 +00:00
Jenkins
85c02af074 Merge "Remove *_url inisets since now come from catalog" 2014-05-22 17:51:45 +00:00
Sean M. Collins
e13fd6006d Create an IPv6 network that uses an external router for IPv6
Change-Id: Id1498d74db816b3edbb8376ca5acb7cc5792ea5c
2014-05-22 11:47:00 -04:00
Sean M. Collins
5ec6f8f15d Add support for creating provider networks
Implements blueprint neutron-provider-networking

Change-Id: I4bad9483b92875ea5e143b0e11652e01faed35a4
2014-05-22 11:47:00 -04:00
Jenkins
d158fda947 Merge "Add options to configure provider network mappings for OpenDaylight" 2014-05-22 14:33:43 +00:00
Mat Lowery
ba8635a247 Remove *_url inisets since now come from catalog
Another proposed change fetches endpoints from the Keystone catalog as
long as the *_url opts are not present. This change will make Trove on
DevStack use the catalog.

Note: This must merge after https://review.openstack.org/68015.

Change-Id: I397254e72823ab7c7b28014d4fa18e2cefb79e6d
Closes-Bug: #1222891
2014-05-22 05:35:44 +00:00
Gordon Chung
d24afa190c Revert "ceilometer.conf configuration option missing os_auth_url"
patch breaks gate (see any logs/screen-ceilometer-acentral.txt.gz
after this patch)

This reverts commit 4c11089739e6d32b77aea0c8fd2dd3d79570b1c8.

Change-Id: I684d50be1b4d580d385a8bb74b3539b1305ec330
2014-05-21 16:05:38 -04:00
ftersin
4f7bf6963a Fix getting EC2 and S3 urls in create_userrc
Invalid parsing of openstackclient output was introduced in
I03c17cfc9740c3eb257152c95d9c4f021db2c89e. Here command lines
was changed to get urls with no parsing.

Also default EC2_URL was fixed.

Change-Id: Ic46a9989321cf6310c56edeeb737c603a4f9c1ed
2014-05-21 22:09:46 +04:00
Jenkins
9d57dc8b04 Merge "ceilometer.conf configuration option missing os_auth_url" 2014-05-21 10:30:45 +00:00
Jenkins
740822b18b Merge "Use daemon flag only when USE_SCREEN=False" 2014-05-20 19:38:41 +00:00
Sam Hague
09b56b1c31 Add options to configure provider network mappings for
OpenDaylight

OpenDaylight needs to know the physical network mapping
used with vlan tenant isolation. This is similar to how
the bridge_mappings cofig is used to map the physical
network to the bridge,
i.e. bridge_mappings=physnet1:br-eth1,physnet2:br-eth2.

OpenDaylight needs the physical network device itself:
provider_mappings=physnet1:eth1,physnet2:eth2.

OpenDaylight needs the mapping because the device port is
used when pushing flows. The neutron API's provide the
physical provider network value for example as physnet1.

DocImpact:
Use of VLANs with ML2 and the OpenDaylight mechanism driver
requires OpenDaylight Helium or newer to be installed.

Closes-Bug: #1315492
Change-Id: If7af9ce5735b01c35315a54c79355ca87b72c4b4
2014-05-20 18:35:52 +00:00
Terry Wilson
f06c4434f5 Fix notify_nova options
This patch fixes various typos that prevent the neutron nova
notification options from working.

Change-Id: Ia3fb1e02008b338e2d08e927346397292be4e398
Closes-Bug: #1321347
2014-05-20 10:56:48 -05:00
Longgeek
4c11089739 ceilometer.conf configuration option missing os_auth_url
ceilometer-agent-centrol error connection keystone: \
Skip interval_task because Keystone error: \
Authorization Failed: Unable to establish connection to
http://localhost:5000/v2.0/tokens

Fixed bug #1320951

Change-Id: Iae722595cb51e11e604d373779d74a8968ea3324
2014-05-20 15:02:25 +00:00
Jenkins
d65f7a2858 Merge "Upgrade to cirros 0.3.2" 2014-05-19 19:20:00 +00:00
Jenkins
3d11c189c6 Merge "Add new configuration files for ceilometer" 2014-05-19 18:38:54 +00:00
Jenkins
9c2962a255 Merge "XenAPI: Fix final script to include functions" 2014-05-19 18:38:48 +00:00
Jenkins
0b2ee8fd4d Merge "Workaround Fedora libvirtd issues on Xen instances" 2014-05-19 18:38:41 +00:00
Ian Wienand
3ca91b2186 Workaround Fedora libvirtd issues on Xen instances
Fedora libvirtd fails to start on Xen instances (i.e. rackspace
instances) due to [1].  This works around the issue until it can be
fixed upstream.

[1] https://bugzilla.redhat.com/show_bug.cgi?id=1098376

Change-Id: I3790b5025982730263a6a84fce596e80f09efd5a
2014-05-19 18:37:56 +10:00
Malini Kamalambal
b0c3859c30 Use daemon flag only when USE_SCREEN=False
This patch removes the daemon option, when devstack is started
with USE_SCREEN=True.

Change-Id: Ib3b1c0b2abf9111b767b3d557dacdc7a89a38f59
2014-05-18 09:03:43 -04:00
Attila Fazekas
692011593e Move gcc to general
Lot of packages explicitly requires gcc now, but almost all of
the components needs it.

Always keep gcc in hand-range.

files/rpms/general: always installs the libxlst2-devel, not just on
RHEL 6, package recompile capability always handy and these are small
packages anyway.

Change-Id: Ia7d0e1938fb2453e3c02b979f99d6d179c6a24c6
2014-05-18 09:40:23 +02:00
ZhiQiang Fan
95053cf4d0 Add new configuration files for ceilometer
According to patch: https://review.openstack.org/#/c/77957/, and patch:
https://review.openstack.org/#/c/42713/15, new configuration files named
api_paste.ini and event_definitions.yaml are introduced, this patch
adds them to ceilometer configuration directory.

Change-Id: I57165d588da35f13b2d22629b48dc087502598a7
2014-05-16 16:52:49 +08:00
Jenkins
f2fd04924f Merge "Add an option in lib/swift to increase max_header_size" 2014-05-15 21:20:54 +00:00
Jenkins
40c4313edd Merge "Use urandom rather than openssl for password gen" 2014-05-15 21:20:52 +00:00
Bob Ball
d06d4550de XenAPI: Fix final script to include functions
Generally a ubuntu template is supplied - but in the case
where it is not, we need to source functions before sourcing
stackrc (Through xenrc)

Change-Id: I8325cf1c6f83946b7798e6d1bb8278e86831d3c4
2014-05-15 21:12:50 +01:00
Sean M. Collins
bb2908b7e7 Add support for the IPv6 extended attributes in Tempest
Implements blueprint tempest-ipv6-attributes-support

Change-Id: I96bb78828eeb5548bb075f936342a027b9d11652
2014-05-15 10:24:31 -04:00
Radoslaw Smigielski
8c666cf22b README.md reformatting.
Break the very long lines into less than 80 characters long lines.

Change-Id: I40deb0f2b6170308fe192971a3edbf48ca6190ad
2014-05-14 12:38:08 +01:00
Ian Wienand
26a28b4af5 Use urandom rather than openssl for password gen
I tried using devstack on a cloud image that didn't have openssl, so
it generated blank passwords and gave an error about openssl missing.
Using urandom should not require more than minimal shell tools.

Change-Id: Ib3091183eb1d85fc8cf7c76e47da24a04ae4791f
2014-05-14 14:10:47 +10:00
Jenkins
8cedabcea8 Merge "stack.sh fails for Cisco plugin with missing cisco_plugins.ini error" 2014-05-10 12:24:16 +00:00
Jenkins
72f32d3b97 Merge "Fix incorrect comparisions" 2014-05-09 22:12:40 +00:00
Jenkins
c63a7034d9 Merge "Use public gateway for Trove if neutron is enabled" 2014-05-08 23:13:12 +00:00
Bob Ball
8901245ef5 client-env requires admin permissions
openstack endpoint show identity will not be successful without
admin permissions; this causes exercise.sh to fail because it
claims keystone is not present

Change-Id: I769d70d0439c0b4c7e174a0adad7adcf1938095e
Closes-bug: 1317507
2014-05-08 13:36:33 +01:00