213 Commits

Author SHA1 Message Date
Jenkins
9f8e0b6f5c Merge "Move rabbit/kombu settings to oslo_messaging_rabbit section" 2015-06-09 17:13:14 +00:00
Jenkins
989ffa65f4 Merge "Allow setting default config/signal transport" 2015-06-09 14:39:55 +00:00
Colleen Murphy
2aaab3d4d5 Unpin beaker-rspec
The latest version of beaker tries to manage sshd_config[1] in order to
pass through environment variables. JJB also tries to manage
sshd_config by adding Match blocks to securely allow root SSH[2]. When
beaker tries to append the PermitUserEnvironment line after the Match
blocks, SSH fails to open port 22 and beaker can't SSH in to the
node[3]. This patch unpins beaker-rspec and adds set_env: false to the
nodepool nodesets so that the set_env method is never called and does
not try to mess with the sshd_config.

[1] https://github.com/puppetlabs/beaker/blob/master/lib/beaker/host_prebuilt_steps.rb#L528
[2] http://git.openstack.org/cgit/openstack-infra/project-config/tree/jenkins/jobs/puppet-module-jobs.yaml#n42
[3] http://logs.openstack.org/61/185161/1/check/gate-puppet-nova-puppet-beaker-rspec-dsvm-centos7/cd81608/console.html.gz#_2015-05-22_22_05_46_933
[4] https://github.com/puppetlabs/beaker/blob/master/lib/beaker/host_prebuilt_steps.rb#L502

Change-Id: I4064e8fe27eb2a2c2be6d8437ce7f97709529b45
2015-06-08 13:43:51 -07:00
Gael Chamoulaud
456355e470 Move rabbit/kombu settings to oslo_messaging_rabbit section
Kilo oslo-messaging deprecates rabbit/kombu settings in the
DEFAULT section.

Move these settings to proper oslo_messaging_rabbit section.

Change-Id: I8cd5fb7b8074e0acd62535238fe73a4bb9869a5d
Closes-bug: 1444161
Signed-off-by: Gael Chamoulaud <gchamoul@redhat.com>
2015-06-08 17:26:46 +00:00
Clayton O'Neill
bfa9f0aa3e Run db_sync when heat-common is upgraded
The other packages appear to already have this, but heat-common isn't
triggering a db sync, and at least on Ubuntu, if this package is
upgraded first, all the others get pulled in also.  When that happens,
Puppet doesn't trigger a notification for the other packages and the db
sync is never run.

Change-Id: I454220ee6c501c416b60564fd3b1f00fdecfd296
2015-06-06 12:35:03 +00:00
Steve Baker
8e97bd8438 Allow setting default config/signal transport
This change allows the Kilo heat.conf options
default_software_config_transport and default_deployment_signal_transport to
be set. This is required for operators who would prefer a different default
transort, such as Swift TempURLs.

Change-Id: I66a20f2fd6370909165093b77ef04992fb735380
2015-05-28 12:56:12 +12:00
Emilien Macchi
01004884a1 Bring Redhat support to acceptance tests
OpenStack Infra has jobs to run this on both Ubuntu Trusty and CentOS7.

* Add minitest to Gemfile (dependency to run beaker on centos - see
  http://projects.theforeman.org/issues/2650 for details)
* separate nodepool files to have trusty & centos7 support in OS infra
* basic_keystone_spec: add case for repo configuration and support
  RH systems.
* rabbitmq: install module from source
* apt: pin the module
* heat encryption key parameter: use a valid length for the key

Change-Id: If9820a65f1310fe85ff43b32468b746268c04ea0
Closes-bug: #1444736
2015-05-14 13:20:13 -04:00
Emilien Macchi
1750f36a06 Beaker: install APT repo with openstack_extras
Use openstack_extras module to manage Ubuntu Cloud Archive repository.

Change-Id: I1372f046972ec188c87cbb51ad02eb734c580cb1
2015-05-14 09:33:42 -04:00
Jenkins
a974b0651c Merge "Engine: validate auth_encryption_key" 2015-05-06 18:54:42 +00:00
Emilien Macchi
2eaa030fe8 Beaker tests
Implement basic structure for beaker tests.

Change-Id: I2824af6868222b1c31b2031194a956308ec1b4b6
Closes-bug: #1444736
2015-05-01 17:36:34 -04:00
Emilien Macchi
23d58ec2b6 Engine: validate auth_encryption_key
When using a string with a length != 16, 24, or 32 as value for the
auth_encryption_key parameter in the /etc/heat/heat.conf file it is not
possible to create new stacks. Creating a new stack (and probably
anything else) will fail with the following exception:

ValueError: AES key must be either 16, 24, or 32 bytes long.

Change-Id: I4e35cf0f782f22861319d05a3f028e5784ad26d5
Closes-bug: #1415887
2015-04-29 18:59:02 -04:00
Jenkins
2d33876661 Merge "Make package_ensure consistent across classes" 2015-04-23 19:23:48 +00:00
Clayton O'Neill
8b6cf3bbb7 Make package_ensure consistent across classes
This adds a package_ensure parameter to all classes that did not have it
and updated all package resources to use the package_ensure parameter.

Change-Id: I49c3e50153bc5eba323c5a766ed1f30c23653985
2015-04-23 13:42:56 -04:00
Jenkins
d96f5be30e Merge "Bump rspec-puppet to 2.1.0" 2015-04-23 14:56:44 +00:00
Emilien Macchi
32fe930012 Bump rspec-puppet to 2.1.0
rspec-puppet 2.1.0 includes Puppet 4.0 support [1].

[1] https://github.com/rodjek/rspec-puppet/commits/v2.1.0

Change-Id: Id85ab649da7d1d75076404d77ec4e7bfe165c38f
2015-04-22 23:49:35 -04:00
Jenkins
9288f7115c Merge "MySQL: change default MySQL collate to utf8_general_ci" 2015-04-22 04:02:37 +00:00
Emilien Macchi
b531066283 MySQL: change default MySQL collate to utf8_general_ci
Install & configure MySQL database by using utf8_general_ci collation
which is the way documented in OpenStack [1] and already the default
in puppetlabs-mysql [2].

[1] http://goo.gl/GA5gyZ
[2] https://github.com/puppetlabs/puppetlabs-mysql/blob/master/manifests/db.pp#L7

Change-Id: I8037d3c1971e4b9bc965a9fd0884e1839585d071
Closes-bug: #1446375
2015-04-21 18:53:53 -04:00
Jenkins
de99d07d32 Merge "rename keystone_v2_authenticate method" 2015-04-21 20:53:29 +00:00
Jenkins
04b16b2150 Merge "Synchronize LICENSE file with OpenStack projects" 2015-04-20 14:25:58 +00:00
Emilien Macchi
94d40ed7b0 Synchronize LICENSE file with OpenStack projects
Update LICENSE file to be the same as other OpenStack projects.

Change-Id: Ide0b9af4144d178cbfe53bc291f8c260a00aec6e
Closes-bug: #1241725
2015-04-20 09:26:33 -04:00
Jenkins
80e16dc975 Merge "Pin puppetlabs-concat to 1.2.1 in fixtures" 2015-04-16 08:26:04 +00:00
Colleen Murphy
bda97e32c7 Pin puppetlabs-concat to 1.2.1 in fixtures
Puppet Labs is in the process of releasing a 2.0.0 version of
puppetlabs-concat, which will have many breaking changes that affect
many dependent modules. Changes have been merged to master, but not yet
released. While we figure out what changes we need to make in our own
modules and wait for updates in dependent modules, we should just pin
to a stable version.

Change-Id: Id3a431a3ac7ee4a2f4bf795b59ad912fe4c0a6cc
2015-04-15 15:29:43 -07:00
Emilien Macchi
d73a719477 rename keystone_v2_authenticate method
In puppet-neutron, keystone_v2_authenticate already exists and is in
colision with the keystone_v2_authenticate in puppet-heat.

While we move the whole method in puppet-openstacklib, let's just rename
the method from keystone_v2_authenticate to keystone_v2_auth.

Closes-bug #1429096

Change-Id: I15b6d0550bb3baef37d7536d264b822768802ad0
2015-04-14 17:40:24 -04:00
Martin Mágr
c280fa5501 Fix Keystone domain class
Currently ::heat::keystone::domain works only if keystonerc_admin
is sourced because of missing OS_TENANT_NAME env given to script
heat-keystone-setup-domain. This patch fixes this issue.

Change-Id: Idf5d35df2c39fe724350a00437b76be3333194c2
2015-04-14 11:42:06 +02:00
Yanis Guenane
744f4bbcf5 Create a sync_db boolean for Heat.
Other components offer the option to decide whether or not to run the
db sync command. Heat was missing this feature. This commit add this
feature for Heat.

Change-Id: I06b669123fe08e02c66ee34dab78a943ff5de90c
2015-04-07 11:51:28 +02:00
Jenkins
bbeb24c51a Merge "Fix ipv6 support" 2015-03-30 18:46:27 +00:00
Jenkins
9a851c5f6c Merge "Tag all Heat packages" 2015-03-30 13:26:42 +00:00
Gael Chamoulaud
73df608936 Tag all Heat packages
Some users wish to override the default package provider by their own.

Tag all packages with the 'openstack' to allow mass resource attributes
override using resource collectors.

Closes-bug: #1391209

Change-Id: I09e54700438894e22d29605fec51bb056baf4050
Signed-off-by: Gael Chamoulaud <gchamoul@redhat.com>
2015-03-28 19:07:21 +01:00
Gael Chamoulaud
e0bf023733 Fix Rspec 3.x new is_expected.[to|to_not| keywords
Some 'should' keyword have been forgotten during the rspec2.x to
rspec3.x updates. This patch fixes that!

Change-Id: I4acffbbfb051fce7f48d401812fce2c1afcc137d
Signed-off-by: Gael Chamoulaud <gchamoul@redhat.com>
2015-03-27 17:38:34 +01:00
Matt Fischer
dc047a0f01 Add support for stack_adopt and move stack_abandon
This adds support for enable_stack_adopt and moves
enable_stack_abandon out of the engine manifest and into the main one.

Change-Id: I93629f2b2173a767669fec0b17107a69dbf759de
2015-03-27 10:23:39 -06:00
Jenkins
6c2de4990c Merge "Added missing enable_stack_abandon configuration option." 2015-03-26 14:14:56 +00:00
Lukas Bezdicka
2331ba06e3 Fix ipv6 support
There is issue with ipv6 where address has to be in brackets, this causes the
underlying ruby TCPSocket to fail. Net::HTTP.new will fail without brackets on
joining the ipv6 address with :port or passing brackets to TCPSocket. It was
found that if we use Net::HTTP.start with url.hostname the incriminated code
won't be hit.

Change-Id: Ia70e05098b52121d12b035bdab59685b086523db
Closes-Bug: rhbz#1185652
2015-03-20 09:55:25 -04:00
Martin Mágr
8c09567b62 Log output of heat-keystone-setup-domain
For debugging reasons output of the script should be logged (and I'm
very sorry that I didn't realize it in the original patch).

Change-Id: I7799021b51039bffd7082c4e587fe49b8424f5d0
2015-03-19 10:27:56 +01:00
Johannes Grassler
c67c563416 Added missing enable_stack_abandon configuration option.
Change-Id: I71f8aa8abb211ec25075d5dea2f8a9014fe22c28
Closes-Bug: #1415986
2015-03-11 22:12:54 +01:00
Gael Chamoulaud
89ca576fa6 Fix tabs included in d7e9fe0e
Change-Id: Ia537d3749ee4e8c18990fdb32cf648af7e4f5286
Signed-off-by: Gael Chamoulaud <gchamoul@redhat.com>
2015-03-11 18:49:32 +01:00
Jenkins
76187ef191 Merge "Add Puppet 4.x lint checks" 2015-03-11 17:14:23 +00:00
Jenkins
bfa013771b Merge "spec: updates for rspec-puppet 2.x and rspec 3.x" 2015-03-11 17:13:55 +00:00
Jenkins
a8b8664108 Merge "Set instance_user in heat." 2015-03-06 18:07:02 +00:00
Jenkins
705534945b Merge "Make configuring the service optional." 2015-03-06 18:06:21 +00:00
Sebastien Badia
44e1bbf039 Add Puppet 4.x lint checks
This changes the puppet-lint requirement to 1.1.x, so that we can use
puppet-lint plugins. Most of these plugins are for 4.x compat, but some
just catch common errors.

Change-Id: If5f03538be85cee4a1d3b4c9a87eae1230432114
2015-03-02 13:54:32 +01:00
Sebastien Badia
d7e9fe0e7a spec: updates for rspec-puppet 2.x and rspec 3.x
This patch aim to update our specs test in order to work with the
rspec-puppet release 2.0.0, in the mean time, we update rspec syntax
in order to be prepared for rspec 3.x move.

In details:
  * Use shared_examples "a Puppet::Error" for puppet::error tests
  * Convert 'should' keyword to 'is_expected.to' (prepare rspec 3.x)
  * Fix spec tests for rspec-puppet 2.0.0
  * Upgrade and pin rspec-puppet from 1.0.1 to 2.0.0
  * Clean Gemfile (remove over-specificication of runtime deps of puppetlabs_spec_helper)
  * Remove un-used puppet-lint (name_containing_dash config)

Change-Id: I1b82e4f6ec0b1bbf52e86c5d127413a26277ae8c
Card: https://trello.com/c/eHXc1Ryd/4-investigate-the-necessary-change-to-be-rspec-puppet-2-0-0-compliant
2015-03-02 13:54:32 +01:00
Sebastien Badia
e68dc141cc Fix metadata.json lint issues
Update license name to match a valid SPDX ID, and fix open-ended deps.
https://docs.puppetlabs.com/puppet/latest/reference/modules_publishing.html

Change-Id: I3604f3f523200ecf074cc87aa336212b3c64f2a7
2015-03-02 13:53:42 +01:00
Matt Fischer
4276170148 Set instance_user in heat.
If you leave it commented out, heat defaults it to ec2-user which can be
confusing to users. This allows you to set the value.

Change-Id: I44fef59d3ed1f7851d8504855a7ae0d5460fdc84
2015-03-01 19:00:27 -07:00
Matt Fischer
0993b23eeb Make configuring the service optional.
Even if the endpoint is disabled the service will always be created.
Make this settable like the endpoint.

Change-Id: I7a4f7c660c1ce857f936156a0e3d2bb419571759
2015-03-01 18:49:43 -07:00
Jenkins
4fd2ce2d82 Merge "Add support for identity_uri." 2015-03-02 01:37:09 +00:00
Matt Fischer
ab27c58659 Add support for identity_uri.
This patch adds the ability to set a new identity_uri parameter.
It also deprecates the old auth_host, auth_port, auth_protocol,
and auth_admin_prefix parameters. Logic is in place so that
users of the deprecated settings should have a smooth upgrade
process and get deprecation warnings until they adopt the
new settings.

Change-Id: I833bbac9338553daf88459a311f14a3788d90dfb
2015-02-27 10:25:24 -07:00
Matt Fischer
02df1c7974 Mark heat's keystone password as secret
Change-Id: I7d4e0fe452566435eb67d3d9ed6b3849021ba690
2015-02-24 13:22:50 -07:00
Jenkins
a0e1f3ab69 Merge "fixtures: Unpin puppetlabs-mysql module" 2015-02-09 22:17:48 +00:00
Matt Fischer
d24f0290e0 Support region_name for Heat
In environments with more than one region, heat will just pick the first
endpoints it sees in the catalog unless the region is specified. This
allows the ability to tell Heat which region to use

Change-Id: I795315fee8955d9c1c29e273852f6dad3b777019
2015-02-04 19:59:55 -07:00
Jenkins
511c3dbf30 Merge "added option to configure flavor in heat.conf" 2015-02-05 02:49:28 +00:00