1915 Commits

Author SHA1 Message Date
Jenkins
8636a5ece1 Merge "heat engine : loadbalancer resource template, refer to StackId" 2013-02-28 12:21:43 +00:00
Jenkins
fde20780e5 Merge "heat engine : Re-resolve resource static data before create" 2013-02-28 12:21:01 +00:00
Jenkins
9d3bdfd523 Merge "heat engine : Compare runtime resolved resource snippets on update" 2013-02-28 12:20:34 +00:00
Jenkins
fce0c8a20a Merge "heat engine : Set stack parameters AWS::StackId on stack create/store" 2013-02-28 12:05:05 +00:00
Jenkins
6c5bd880df Merge "heat engine : Add parser parameter support for AWS::StackId" 2013-02-28 12:04:17 +00:00
Jenkins
95c803746a Merge "Put heat data files in /var/lib/heat-cfntools" 2013-02-28 02:51:45 +00:00
Jenkins
acbb5871e3 Merge "Remove duplicate Mapper() constructor" 2013-02-28 01:42:58 +00:00
Steven Dake
737cc26570 Put heat data files in /var/lib/heat-cfntools
The /var/lib/heat-cfntools directory should be owned by the
heat-cfntools package for whichever distro it is included.

This avoids the problem of heat writing to directories owned
by cloud-init.

For the moment, the part handler will continue to write to
/var/lib/cloud/data to be removed at a later date.

Change-Id: I70b714c70ed146d4f6807850d6e7264c6a4624cd
Fixes: Bug #1105806
2013-02-27 18:31:04 -07:00
Steve Baker
e4022108f6 Depend on recently released python-quantumclient 2.1.2
Fixes bug 1133381

Change-Id: I9e3f1185e77c8f021a523f201d2191389eb253ef
2013-02-28 10:06:55 +13:00
Angus Salkeld
9ea6ae892f Remove duplicate Mapper() constructor
Change-Id: Ie65fa739dc90515a7170a49c0552b69cdbb7d044
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
2013-02-27 20:52:46 +00:00
Steven Hardy
6b55ccfaea heat engine : loadbalancer resource template, refer to StackId
Use the new AWS::StackId pseudo parameter to refer to the stack for
cfn-hup etc, otherwise the stack lookup by name will fail - using
the AWS::StackId parameter means we'll refer to the stack via the
full ARN and the CFN API will be able to lookup the nested stack.

ref bug 1131666

Change-Id: Ieac738df766ae1f1039e743d465cd080b2090473
2013-02-27 16:17:30 +00:00
Steven Hardy
83780a788f heat engine : Re-resolve resource static data before create
Re-resolve the template static data before creating the resource,
or we resolve the wrong value for the AWS::StackId pseudo parameter
which is updated after the parser.Stack gets stored.

ref bug 1131666

Change-Id: I68e87366d379356fd7f2685367300abe5594d6f6
2013-02-27 16:17:30 +00:00
Steven Hardy
f4fcb7bd5a heat engine : Compare runtime resolved resource snippets on update
We need to compare the runtime resolved resource snippet, since that
is what we get back from self.parsed_template.  If we don't do this,
then we get a false positive when a Ref to a parameter which gets
updated (e.g AWS::StackId) is used in the resource properties.

ref bug 1131666

Change-Id: Ib488c43b9eca998a7a82b7571097f5bb69ef946c
2013-02-27 16:17:30 +00:00
Steven Hardy
79bc8170a0 heat engine : Set stack parameters AWS::StackId on stack create/store
We need to set the ARN provided via the AWS::StackId pseudo parameter
when the stack is stored, and also whenever a parser.Stack object is
created

ref bug 1131666

Change-Id: Ic8dc5ab2b25c85c51f2f685fe69bb2447a1e3615
2013-02-27 16:17:30 +00:00
Steven Hardy
8a4a1960f1 heat engine : Add parser parameter support for AWS::StackId
Adds support for the AWS::StackId pseudo parameter, which will
allow us to to reference the stack ARN in the template, e.g so that
stacks can query their resource metadata via ARN not stack name,
which will solve the problem with nested resource being unable
to query their metadata.

ref bug 1131666

Change-Id: Ib7b1d380fa8766b6d0c968bd66270da8ce8245c4
2013-02-27 16:10:36 +00:00
Robert van Leeuwen
151ee297c3 Removes unused config settings from heat-engine.conf
Change-Id: Ia660009f18eae9d9c22adc5ab36c18f711856bce
Fixes: bug #1134346
2013-02-27 14:35:52 +01:00
Steven Hardy
7dace2f835 heat engine : Make loadbalancer nested template raw string
Make the nested template a raw string so we don't need to remember
to double backslash everything

Change-Id: I307db94f8b610f66eafa68f060dcef742a9e1375
2013-02-26 17:58:37 +00:00
Steven Hardy
d6f8dfed16 Add waitcondition to loadbalancer nested template
We want to ensure the LB instance has fully launched before declaring
this resource created, otherwise the resource will not be functional
and attempts to modify config via metadata updates will fail

Change-Id: I879c21302f1c3a75a567d959fc2e398c7bfc3f65
2013-02-26 17:58:37 +00:00
Steven Hardy
7f1cacf44d heat engine : fix variable/import shadowing in service.py
The resources import is shadowed by a variable declaration in
validate template, which is confusing, so add a prefix to
differentiate the variable from the import

bug 1133434

Change-Id: Ia7c451c3a2588ddff114da9897b3bcf58e68cf0c
2013-02-26 16:36:42 +00:00
Steven Hardy
da31d59cc0 heat engine : reinstate resources import
Reinstate the resources import removed by 06f4f85, without this
we fail to create any resources (GenericResource is created for
all resources due to no resource plugins being imported).

bug 1133434

Change-Id: I2b24d58dee83a426deee09f8a9a121f503534de4
2013-02-26 16:36:42 +00:00
Jenkins
2e7e3242a5 Merge "Update the metadata if an alarm action makes changes" 2013-02-26 04:25:41 +00:00
Jenkins
036bdaa142 Merge "Make the alarm actions run in one thread" 2013-02-26 03:18:26 +00:00
Jenkins
4400520aed Merge "Throw a proper error if the flavor is missing." 2013-02-25 23:44:11 +00:00
Angus Salkeld
cca4de0c85 Update the metadata if an alarm action makes changes
The point of this change?
- You have another instances' ip in your metadata and if it
  gets restarted you want cfn-hup to see the new ip.

How is it achieved?
- poll for the metadata so you can see these changes (cfn-hup)
- when ever an alarm action is run we make sure the metadata is refreshed.

bug #1131024
Change-Id: I0798c4da9689b126c3c98cafa63138ff2c484ea9
2013-02-26 09:16:44 +11:00
Angus Salkeld
06f4f85871 Make the alarm actions run in one thread
bug #1131024
Change-Id: I678d8919a17fc73350ec9061ad2a7234e1d6b9f6
2013-02-26 09:16:12 +11:00
Jenkins
bb5404ae11 Merge "heat : Only set qpid loglevel when rpc_backend specifies qpid" 2013-02-25 16:09:55 +00:00
Steven Hardy
fe4955b49e heat : Only set qpid loglevel when rpc_backend specifies qpid
fixes bug 1132709

Change-Id: Iefad8be07ab806b17f04ff536af955dc015ee4be
2013-02-25 10:36:13 +00:00
Zane Bitter
e897e13340 Use a short_id for naming S3 containers
Change-Id: Iba8ea4eb536d58e1332897cec2059aebbb41b28a
Signed-off-by: Zane Bitter <zbitter@redhat.com>
2013-02-25 10:51:47 +01:00
Zane Bitter
6d52011ed2 Use a short_id for naming Swift containers
Change-Id: Id6ee6b92f05326e3feda3f2b770fff5864e38e19
Signed-off-by: Zane Bitter <zbitter@redhat.com>
2013-02-25 10:51:45 +01:00
Zane Bitter
ebcad29e1e Add a module for generating random short ID strings
These can be used to ensure uniqueness of names when creating resources in
OpenStack services.

Change-Id: Ifb048fd8ec676b7fd6a15c5d4a39bfc98f0aeca9
Signed-off-by: Zane Bitter <zbitter@redhat.com>
2013-02-25 10:51:41 +01:00
Angus Salkeld
7c920dbe0b Make the exception string a little more useful
This partial helps bug #1119883

Change-Id: I247ab39406bcc608c0d66a8140dc198b93491ac1
2013-02-25 11:15:17 +11:00
Jenkins
d5cd88b484 Merge "Protect AccessKey deletion from failing" 2013-02-24 22:26:25 +00:00
Jenkins
0bea9e7c8d Merge "Remove compat cfg wrapper" 2013-02-24 22:08:35 +00:00
Jenkins
e5d98d5555 Merge "Make quantumclient optional again" 2013-02-24 22:02:40 +00:00
Mark McLoughlin
75b28f26bb Remove compat cfg wrapper
This wrapper was there to allow oslo-config changes through the gate
while keystoneclient hadn't been updated.

Change-Id: I3d48673af58ae379e8e4d2c7fb4b4d81f3ed67dd
2013-02-23 09:55:39 +00:00
Jenkins
bf64384918 Merge "Fix tarball tag to be empty rather than a point" 2013-02-22 17:21:42 +00:00
Zane Bitter
45be56e26a Make quantumclient optional again
Don't crash if quantumclient is not available; just don't register the
resource types that require it.

Change-Id: I9dacc5397327ef7ec784f808227582ee9bd037df
Signed-off-by: Zane Bitter <zbitter@redhat.com>
2013-02-22 16:05:11 +01:00
Zane Bitter
d055650dce Get rid of unused imports
Change-Id: I954cf6eb2c326bbeb6bd043b2c11dfe2e01f52d3
Signed-off-by: Zane Bitter <zbitter@redhat.com>
2013-02-22 16:05:11 +01:00
Jenkins
7bcb659215 Merge "heat loadbalancer : make LB nested template create credentials" 2013-02-22 14:28:13 +00:00
Jenkins
5f18a8147d Merge "heat api : allow validation of YAML templates via cfn api" 2013-02-22 13:11:39 +00:00
Steven Hardy
a756566e49 heat loadbalancer : make LB nested template create credentials
Create User/AccessKey resources correctly in the LB nested template
so we can create a cfn-credentials file which will allow cfn-hup
to access the CFN API

fixes bug 1131663

Change-Id: I11b6640dbc5689de8f6103f4c1e841f42acbba54
2013-02-22 11:40:30 +00:00
Jenkins
1d2444bb0a Merge "heat api : don't store whole request in ec2Credentials context" 2013-02-22 11:21:43 +00:00
Angus Salkeld
f1ce0de322 Protect AccessKey deletion from failing
The deletion calls _get_user() that calls FnGetRefId for each
resource. But since this is the delete most resources have been
deleted.

bug #1131534

Change-Id: I08ffd27d1d05214b1a8cf86744e7d4f91d7e1558
2013-02-22 21:25:05 +11:00
Thierry Carrez
deab965eae Fix tarball tag to be empty rather than a point
Fix tarball tag to be empty rather than a point.
Really fixes bug 1131622.

Change-Id: Idfbd3eb7f5e0fb855e3153ac465896652eb74343
2013-02-22 10:25:39 +01:00
Thierry Carrez
651891c306 Do not tag development releases "dev"
Do not tag development releases "dev", as it conflicts with our common
versioning code. Fixes bug 1131622.

Change-Id: I33ab25de1d1509c79d11f1919239798663b0cd22
2013-02-22 10:03:09 +01:00
Steven Hardy
a2911cebd6 heat api : allow validation of YAML templates via cfn api
Currently validation only works if the template is json

fixes bug 1131290

Change-Id: Ia08ba7cc18908697b5fdfc1eb711d84d7b39c7cb
2013-02-21 17:30:33 +00:00
Steven Hardy
5d6745e8e6 heat api : don't store whole request in ec2Credentials context
The ec2token middleware currently dumps the whole request into the
request context when using AWS Auth, when all we really want are
the credentials (accesskey/signature)

fixes bug 1072917

Change-Id: I8fb0d4d7ada29d7d19c702a7da1251384166c246
2013-02-21 17:12:53 +00:00
Steven Hardy
409a2705b3 heat tests : fix run_tests.sh pep checks
run_tests.sh parses tox.ini, which has been changed removing the
pep8 version, so remove this test and specify the version in
test-requires.  This allows the pep tests to run via run_tests.sh
again, a subsequent patch can reinstate the version check based
on the test-requires version

fixes bug 1131251

Change-Id: Ib24f588cbe81ded768376c138d9d89f5bb311185
2013-02-21 15:58:38 +00:00
Jenkins
a4eac4da5d Merge "Add an attribute to InstanceGroup and AutoScalingGroup to return the ips" 2013-02-21 15:05:09 +00:00
Jenkins
a2945a20cc Merge "heat : bump oslo-config version to fix import error" 2013-02-21 14:54:19 +00:00