3529 Commits

Author SHA1 Message Date
Angus Salkeld
5f0faff409 Only log to console in heat-db-setup
Make sure heat-manage does not use heat.conf logging
in the heat-db-setup script as the logging directory
might not be setup yet.

Change-Id: I16db3fde1c7bfe5f027c77f2a25ffa2104d15491
Closes-bug: #1191925
2013-10-29 08:26:40 +11:00
Angus Salkeld
3087c5d6e7 Change heat-api.org to openstack.org
Remove the last reference to heat-api.org

Change-Id: Idbeeff7b65ba5fce0b7c80d22618dca3e92996f3
Closes-bug: #1220381
2013-10-28 10:42:46 +11:00
OpenStack Jenkins
b7c50f753a Merge "Imported Translations from Transifex" 2013-10-25 23:12:50 +00:00
Vijendar Komalla
3e6933ce3f Instance delete should check for 'DELETED' status
Currently in Instance.py check_delete_complete method is waiting
for 'NotFound' exception. This change is to wait for 'DELETED'
state to speed up the resource/stack delete.

Closes-Bug: #1243389

Change-Id: I09712f548f40bb13c2b322550007f5bd30dfb3e2
2013-10-25 12:18:09 -05:00
Jenkins
0c4d305fef Merge "change neutron to use UpdateAllowed property schema" 2013-10-25 12:07:51 +00:00
Jenkins
8a32e818c3 Merge "change alarms to use UpdateAllowed property schema" 2013-10-25 12:07:48 +00:00
Jenkins
9e92fa8b36 Merge "change contrib/ to use UpdateAllowed property schema" 2013-10-25 12:07:46 +00:00
Jenkins
acfc113df4 Merge "change base resources to use UpdateAllowed property schema" 2013-10-25 12:05:21 +00:00
Jenkins
2ff8d04fa7 Merge "Support defining update_allowed in the property_schema" 2013-10-25 12:04:33 +00:00
Jenkins
34d3b388c5 Merge "Stub out unmocked keystone in test_engine_service" 2013-10-25 12:02:14 +00:00
Jenkins
393760bdef Merge "Delete deprecated docs/ directory" 2013-10-25 10:29:29 +00:00
Jenkins
c1cca4d54a Merge "Tolerate lookup failures in Fn::Select" 2013-10-25 10:20:59 +00:00
OpenStack Jenkins
14f1d213b8 Imported Translations from Transifex
Change-Id: I92d6619eaf197e94984f0e7666964dca3457f608
2013-10-25 06:05:39 +00:00
Angus Salkeld
a7ac74bb0d use exception str() not .message
This mostly fixes the accesses to .message, there is still the
translation that is using the .message.

Partial-bug: #1243883
Change-Id: I709f65e39c017d70eaca5d8f6d06e0227b67e816
2013-10-24 18:31:35 -10:00
Jenkins
cda730b4d4 Merge "Stub out unmocked keystone auth in signal tests" 2013-10-25 04:16:38 +00:00
Jenkins
4f94b00bb0 Merge "Fix nested stack test setUp ordering" 2013-10-25 04:07:28 +00:00
OpenStack Jenkins
2dcc6ec278 Merge "Updated from global requirements" 2013-10-25 03:46:07 +00:00
Angus Salkeld
8ccbaa6674 change neutron to use UpdateAllowed property schema
Partial-bug: #1240583
Change-Id: If73c678fc0449aca10c273b4521d006d53e0094a
2013-10-24 16:30:12 -10:00
Angus Salkeld
dbc890e7b6 change alarms to use UpdateAllowed property schema
Partial-bug: #1240583
Change-Id: Icfa37f99b7e016e805526299b7717283cdb9d82d
2013-10-24 16:30:05 -10:00
Angus Salkeld
09bcc8a448 change contrib/ to use UpdateAllowed property schema
Partial-bug: #1240583
Change-Id: I1bf09f10efe7ed47bfa4f0178d29689c9fc71d43
2013-10-24 16:29:57 -10:00
Angus Salkeld
2f71ac6b93 change base resources to use UpdateAllowed property schema
Partial-bug: #124058
Change-Id: I668de29e1eec34d7499dcc8d435ebe6882c74a4a
2013-10-24 16:29:45 -10:00
Angus Salkeld
9fd25fcc55 Support defining update_allowed in the property_schema
This has a couple of advantages:
- docs will be easier to generate
- everything property related is in one place
- it's a bit easier dealing with TemplateResources
- it will allow us to set update_allowed on nested schema

Change-Id: I5e59bc07e51fe4c5d58871cb2adcef7e16f9b2af
Partial-bug: #1240583
2013-10-24 16:29:37 -10:00
Angus Salkeld
66b384b390 Fix nested stack test setUp ordering
This fixes an irrating message during test runs:
No handlers could be found for logger "heat.engine.environment"

This was because the environment was loading before the fake logger
was enabled.

Change-Id: I1a40998fe37bf29529ef2eae348c6918bf56966b
2013-10-24 12:49:52 -10:00
Angus Salkeld
fde416038a Delete deprecated docs/ directory
I think we have deprecated this directory long enough.
We have proper getting started guides and api docs on openstack.org

Change-Id: Iaee690046866b98eea9a206dc6f2dca9b9af18b6
2013-10-24 11:03:11 -10:00
Steve Baker
fade80f76f Tolerate lookup failures in Fn::Select
A wait condition will return an empty dict for its Data attribute
until it has been created, however Fn::Select on Data will be evaluated
before the wait condition is created (for example, during stack-list
or stack-show). The current error raising of Fn::Select leads these
operations to fail.

This change results in Fn::Select evaluation behaving in the
following way:
- KeyError on dict lookup failure results in empty string
- IndexError on list index results in empty string
- Passing an empty string as the value results in an empty string

Closes-Bug: #1243958
Change-Id: I3b01c8ce5dc56e804016274282d2ee69f539bf40
2013-10-25 09:52:55 +13:00
Angus Salkeld
c5e93e6c6b use msg_fmt not message in Exceptions
This doesn't solve the problem yet, but clarifies
the format string from the final string.

Partial-bug: #1243883
Change-Id: Ia0f19423248304984cc53926dfb87c6a49c90e11
2013-10-24 10:44:15 -10:00
Jenkins
8c7872e148 Merge "Use resource_id_set to clear resource ID's" 2013-10-24 20:28:16 +00:00
Clint Byrum
93f44a2b53 Stub out unmocked keystone in test_engine_service
Keystone needs to be mocked out whenever stacks may do something that
triggers authentication. In this case failures to auth would not result
in a failure of the test because we are not asserting the end state of
the stack or the list of events we expect.

Change-Id: I401971cfc984bd71c611eae70aeb33b2f5a3c8c6
Closes-Bug: #1227962
2013-10-24 13:09:03 -07:00
Clint Byrum
5d1942f85a Stub out unmocked keystone auth in signal tests
While these tests do setup a mock for keystoneclient, one of the tests
clears out these stubs before exitting to avoid needing to stub out
things stack_delete_after will do. However, stack_delete_after will
trigger a call to keystoneclient which leads to unmocked calls trying to
reach server.test from inside the tests. These failures go undetected
because they are after the test, and nothing is checking for error
events in this phase.

Change-Id: I608e0b5a263587d5151b4cb4ce3f03e289c4bdca
Partial-Bug: #1227962
2013-10-24 13:09:03 -07:00
Angus Salkeld
7f0c49e742 Reverse assert arguments so the errors make sense
Change-Id: I2919db71019ee56246eb0398ddc0a3170f17e6b2
2013-10-24 07:54:14 -10:00
OpenStack Jenkins
6a8f7876f1 Updated from global requirements
Change-Id: I285fd19a324620ef45551d3844719d7c39767f9e
2013-10-24 13:15:49 +00:00
Jenkins
d0a82ffd42 Merge "Prove that a user can't remove global resources" 2013-10-24 12:43:21 +00:00
OpenStack Jenkins
2700988e03 Merge "Imported Translations from Transifex" 2013-10-24 10:08:46 +00:00
Jenkins
fe8a6a0e57 Merge "change assertEquals to assertEqual" 2013-10-24 10:08:09 +00:00
Angus Salkeld
a5f67a63d0 Prove that a user can't remove global resources
This is obvious looking at the code, but if someone ever
reworks it, then we will need this test case.

part of blueprint exclude-resources-option
Change-Id: Ic04b09597ca5d401fcd40ce9241f12c2f7fca04c
2013-10-24 00:06:59 -10:00
Steven Hardy
a8af2fd844 Use resource_id_set to clear resource ID's
self.resource_id = None is used in several resources, which is wrong,
we should be explicitly updating the resource_id in the DB via the
resource_id_set function.

Change-Id: I41e1326fe7e1da364c8e6dd68f572df484beffb3
2013-10-24 10:47:58 +01:00
Christian Berendt
3bf5177782 change assertEquals to assertEqual
According to http://docs.python.org/2/library/unittest.html
assertEquals is a deprecated alias of assertEqual.

Change-Id: Ic65fb8fad923adc04d90ea9622b23a2ae8290a3a
2013-10-24 08:37:39 +02:00
OpenStack Jenkins
f384a58ae2 Merge "Updated from global requirements" 2013-10-24 06:36:34 +00:00
OpenStack Jenkins
a03e3cbd57 Imported Translations from Transifex
Change-Id: I7b20f835a178827847b5cf338d67bf2348e3c876
2013-10-24 06:05:39 +00:00
Jenkins
80c742c7ad Merge "Repeat Ceilometer alarm actions by default" 2013-10-24 04:22:05 +00:00
Jenkins
b60e4a7cc1 Merge "Allow plugins to be specified as a cloud_backend" 2013-10-24 04:21:27 +00:00
Jenkins
5ba7d6e311 Merge "Add rebuild to OS::Nova::Server" 2013-10-24 03:51:24 +00:00
Jenkins
722af85aa1 Merge "Refactor Nova server resizing to be self contained" 2013-10-24 03:46:47 +00:00
Jenkins
f3e40dd140 Merge "Allow user_data to be passed without modification" 2013-10-24 03:34:46 +00:00
Jenkins
27b96d4f8a Merge "Document security group properties" 2013-10-24 02:39:57 +00:00
Steve Baker
8bde8948cc Allow user_data to be passed without modification
Although heat's agent tooling is heavily dependent on cloud-init, some
users will want to orchestrate servers that are not cloud-init enabled.
They may use their own agent, or a user_data which is executed as a
script on boot. Possibly the user will also want to specify #cloud-config
user_data explicitly.

This change adds the property 'user_data_format' to OS::Nova::Server
with the available options 'HEAT_CFNTOOLS' or 'RAW'.

The following OS::Nova::Server resource snippet was successfully
executed on a cirros image (which does not support cloud-init)
      user_data_format: RAW
      user_data: |
        #!/bin/sh -v
        echo foo > /tmp/bar

This change is completely unrelated to any software configuration
related blueprints, however the property user_data_format has the
potential of supporting more values in the future.

Implements blueprint raw-user-data

Change-Id: I27571620b4fc74a9f82d12a2f754037c00ad81ff
2013-10-24 11:26:59 +13:00
Clint Byrum
152b770bb3 Add rebuild to OS::Nova::Server
Nova has support to rebuild an instance so that it keeps the same
instance id and address. This is particularly useful for doing image
based updates to servers without incurring additional cost to create new
servers and then delete the old ones.

We still default to replacing, and add a new policy called 'REBUILD' for
the times where we want a resource to be rebuilt on image updates rather
than replaced.

blueprint nova-server-rebuild

Change-Id: If0033f52912e939048b5ebc1ee2e30f67d225f34
2013-10-23 12:13:19 -07:00
Clint Byrum
037df7043c Refactor Nova server resizing to be self contained
The split between calling server.resize() and check_resize() makes
it more complicated to add other tasks that can be done in parallel
with other servers' tasks. By making a resize method which is self
contained we simplify the addition of rebuild in a subsequent patch.

Change-Id: I0490476dbef30571e90b88163fc8ca0670458682
2013-10-23 12:07:13 -07:00
Angus Salkeld
4dc987eff3 Repeat Ceilometer alarm actions by default
The policy actions assume repeat_actions=true.

For the situation when cpu is high even when a new server is added.
Here we would expect yet-another server to be added but what currently
happens is the alarm will be stuck in the alarm state, but with no
further actions.

We need a default that it sane.

Closes-bug: #1242168
Related-bug: #1223347
Change-Id: I4c6a084076a0cc01ebd0d7431d3fac559161e947
2013-10-23 07:33:45 -10:00
Andrew Plunk
8ce5e0f88e Allow plugins to be specified as a cloud_backend
Currently, the cloud_backend configuration option can only use modules
imported in-tree before clients.py is imported. This does not work for
plugins because they are dynamically imported in
heat/engine/resources/__init__.py after clients.py is imported. Change
the cloud_backend module to be specified when the client class needs
to be initialized rather than when clients.py is imported. This change
requires a class to be specified for the cloud_backend rather than a
module name.

Change-Id: I8f2b93bfb6a9585d1e7dc52d70092105b6e1bfaa
Closes-Bug: 1242870
2013-10-23 09:39:36 -07:00