1797 Commits

Author SHA1 Message Date
sdake
5862514aef Remove ssh from cloud-config-files
the cc_ssh script already executes in cloud config without being
explicitly called.  As it is now, it is executing twice.

Make it execute only once.

Change-Id: I2d53adbea0175f63db71be516639d40aa0f8a1de
2013-03-14 07:39:44 -07:00
Jenkins
a492c6e04f Merge "Remove Nova dependencies from hacking test" 2013-03-13 22:17:40 +00:00
Jenkins
20cf011566 Merge "heat docs : Add heat-watch manpage" 2013-03-13 19:15:37 +00:00
Steven Hardy
22c9c4e76f heat docs : Add manpage for heat-boto
Fixes bug 1153688

Change-Id: Ie48c7158d253951e5885e8b701cd1c4c9a5fa37e
2013-03-13 14:12:29 +00:00
Zane Bitter
6d6b993287 Remove Nova dependencies from hacking test
References to Nova in the docstrings(!) of the hacking.py tests caused the
run_pep8.sh script to fail if the Grizzly development version of Nova was
not installed. Update all the references to use Heat packages instead.

Change-Id: I2e84e9a231451705d61fa9acddc65ee95a98e294
2013-03-13 12:41:34 +01:00
Steven Hardy
481c8104ed heat docs : Add heat-watch manpage
fixes bug 1153689

Change-Id: I7a4566cb850cf94761c1948fa7ad976e7d4f5446
2013-03-13 11:37:59 +00:00
Angus Salkeld
7149a817b0 Fix security groups (need to be accessed as attributes)
bug 1134193
Thanks Lukas Barton for the patch in the bug.

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
Change-Id: I448ba76fcf47d4e02775ff8eca38897eb399a3cc
2013-03-13 17:16:20 +11:00
Jenkins
724a6fed27 Merge "Remove todolist from docs index" 2013-03-13 00:39:21 +00:00
Angus Salkeld
193f2b257c Remove todolist from docs index
This does not seem to be supported, so removing.

bug 1153681
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

Change-Id: I830980997438562d1ec241c33fcd8e67c32b21d9
2013-03-13 11:13:12 +11:00
Ian Main
4df46a413a Only split roles if they are not None.
Change-Id: I2fbfbd6f6b1c898f7032744f9411821d5d97048c
Signed-off-by: Ian Main <imain@redhat.com>
Fixes: bug #1136891
2013-03-12 21:18:45 +00:00
Jenkins
c8411a3cb2 Merge "Revert NestedStack FnGetRefId changes" 2013-03-12 19:34:32 +00:00
Jenkins
b754782b34 Merge "heat engine : Add validation of stack names" 2013-03-12 18:35:08 +00:00
Jenkins
aa3377512c Merge "heat templates : Update for F18" 2013-03-12 18:35:05 +00:00
Zane Bitter
b15bd9d778 Revert NestedStack FnGetRefId changes
This partially reverts commit e376c83cbd57c0720336848e4b82e3b7b804a347.

Allow StackResource to set the resource_id, since it will be the one
retrieving the stack using it.

Fixes bug #1154202

Change-Id: I2140afb4e9bf89b4eb73e45f4ef5974df98e87e1
2013-03-12 19:29:43 +01:00
Jenkins
f2b1d4b433 Merge "Squash Grizzly database migrations" 2013-03-12 18:29:13 +00:00
Jenkins
e9bd11fd55 Merge "Pin SQLAlchemy to 0.7.x" 2013-03-12 18:10:22 +00:00
Mark McLoughlin
e67d1d1c07 Switch to final 1.1.0 oslo.config release
Fixes bug #1128256

oslo.config has now been released to PyPI in time for Grizzly RC1 so
we can switch to using it directly.

Change-Id: I655f831718ae5f4e25e941ee206fe195214a9a91
2013-03-12 16:37:35 +00:00
Steven Hardy
b2e15ce1f7 heat templates : Update for F18
Remove F16 as it's EOL, update with F18 as it's the current
version.  Leave the default as F17 for now in all except the
Openshift templates (because Openshift doesn't work on F17,
although these templates are currently broken anyway..)

fixes bug 1154121

Change-Id: Ia95e6bfb4a15e355dfb0051d57f5b70a408551c6
2013-03-12 16:37:31 +00:00
Steven Hardy
2075f94b56 heat engine : Add validation of stack names
Add regex validation of stack names, aligns us with stack names
allowed by AWS, with the addition of "." and "_" characters

fixes bug 1103447

Change-Id: I8fab0d3ad03379dfc2a18dc016e66ca8fee6cc86
2013-03-12 14:25:30 +00:00
Dirk Mueller
711b824cdf Pin SQLAlchemy to 0.7.x
0.7.10 has been released and is compatible with 0.7.x. Instead
of pinning to 0.7.9, simply pin to 0.7.x to avoid SQLAlchemy 0.8

Fixes: Bug #1153983

Change-Id: I1a2ea0c36161df15fd55e95a6679628d14858944
2013-03-12 10:25:09 +01:00
Zane Bitter
45bd459318 Squash Grizzly database migrations
Fixes bug #1072949

Change-Id: I07e4d1454141c9011aacdec3a4eb01a3ea1936c9
2013-03-12 10:03:37 +01:00
Zane Bitter
16cd2030aa Use internal DB management
Use our own internal code for managing database migrations, rather than
calling sqlalchemy-migrate's command line directly. This allows us to
automatically specify the initial version of the database, which is
required in order to be able to squash migrations (bug 1072949).

Change-Id: I88206f8b55fe6fe4016cee8e5bf1d5eeb0ae30d2
2013-03-12 10:03:37 +01:00
Jenkins
36672da65e Merge "Register DB options independently of engine" 2013-03-12 02:02:01 +00:00
Jenkins
dd2d5c9a3b Merge "Avoid manipulating DB directly in unit test" 2013-03-11 20:11:56 +00:00
Jenkins
e587079bf4 Merge "Establish an initial version of the database" 2013-03-11 20:10:19 +00:00
Jenkins
340c9f202e Merge "Set correct type for owner_id in DB model" 2013-03-11 20:10:04 +00:00
Jenkins
d1020b9fb9 Merge "Skip quantum unit tests if client not installed" 2013-03-11 20:10:01 +00:00
Zane Bitter
357d977a0a Register DB options independently of engine
We need a script that will just manage database migrations (for bug
1072949), so for this purpose we want to register only the DB options, not
all of the engine options.

Change-Id: I99bb8d5800741d71572a14c3a5a33dcf0e1b0268
2013-03-11 17:36:06 +01:00
Zane Bitter
4888ab12fc Avoid manipulating DB directly in unit test
Use the parser.Stack class for inserting data into the database in the
watch rule unit tests. If there is direct database manipulation in the unit
tests, it risks falling out of step with the implementation in the code (in
this case, by not supplying the disable_rollback value).

(Required to squash DB migrations, bug 1072949)

Change-Id: I66e5a0093d20222c876f52e626043704777dcb6a
2013-03-11 17:36:06 +01:00
Zane Bitter
f6a024be81 Establish an initial version of the database
Adapted from Nova commit ee2f6f1bed21a5ef92d84634cd4e949062073d62. This
will allow us to squash database migrations.

Change-Id: Icede692e4cc866cd27bae3aaa19c1f2466b989d0
2013-03-11 17:36:06 +01:00
Zane Bitter
6d5007e732 Set correct type for owner_id in DB model
This was already fixed in the database migrations (see bug 1078854), but
was still wrong in the model.

Change-Id: I8c0302d295ac228b6911a6c55e841066a502bdb1
2013-03-11 17:36:06 +01:00
Steven Hardy
11cb47f092 heat clients : Fix --timeout option for heat-boto
Fix boto client wrapper so it passes the timeout value to boto

fixes bug 1135970

Change-Id: Ic1d242cf038e9244c8fb2efc65659cd6f9976df3
2013-03-11 16:19:51 +00:00
Zane Bitter
6624f85f96 Skip quantum unit tests if client not installed
Quantum is optional, so we should skip unit tests that require
quantumclient if it is not available.

Fixes bug 1152242

Change-Id: I6c399b1845adfe457051c372601db6352cdf6261
2013-03-11 16:54:20 +01:00
Jenkins
0174b7d4d3 Merge "Delay calling _get_user() until AccessKey is created" 2013-03-11 10:00:24 +00:00
Jenkins
ca112f3f7e Merge "Recognise arn: for REST stack lookup." 2013-03-11 09:57:38 +00:00
Steve Baker
9060187b4d Delay calling _get_user() until AccessKey is created
Change-Id: I149909d9677f348edd415d3e5f37322b8ad33d28
Fixes: bug #1153397
2013-03-11 17:05:44 +13:00
Jenkins
f75171a623 Merge "Update to Quantum Client 2.2.0" 2013-03-10 20:16:02 +00:00
Jenkins
3369d7e491 Merge "heat engine : store stack on failed update" 2013-03-10 20:14:49 +00:00
Steve Baker
8939c3e524 Recognise arn: for REST stack lookup.
Note that the Routes mapper does brittle regexp fu to map parameters,
hence using \x3A for matching a colon

Fixes: Bug #1131759
Change-Id: I063bf9057782c1c0a3f809d4f8068e2594be264d
2013-03-11 09:11:06 +13:00
Aaron Rosen
d10fe9b8ad Update to Quantum Client 2.2.0
This patch updates tools/pip-requires to use the python-quantumclient 2.2
It also limits the version to <3.0.0 to prevent breaking something accidently
when 3.0.0 is released.

Fixes bug 1152695

Change-Id: If47e5bf1d638a2ac87d523651060fc7859bf8049
2013-03-08 10:12:34 -08:00
Steven Hardy
b8aad78cc5 heat engine : store stack on failed update
Store the stack even when the update fails, otherwise we
lose track of the resources which failed on create so they
are not removed on stack delete

fixes bug 1151989

Change-Id: Ic8aa5ef92e188fb704ed25563aa9b86aa69232b4
2013-03-08 17:48:19 +00:00
Jenkins
e64c536c41 Merge "Use stack.resource_by_refid to get the user resource." 2013-03-08 16:55:55 +00:00
Jenkins
4996792d2d Merge "Add Quantum floating ip assoc tests to improve coverage." 2013-03-08 16:55:54 +00:00
Jenkins
932b58dc41 Merge "Add Quantum port tests to improve coverage." 2013-03-08 16:55:52 +00:00
Jenkins
5b374efef6 Merge "Add Quantum floating ip tests to improve coverage." 2013-03-08 16:55:45 +00:00
Angus Salkeld
e657f05494 Add Quantum floating ip assoc tests to improve coverage.
bug 1152445

Change-Id: I7540b233f665f59bdecb171aa353798d2ce310b5
2013-03-08 23:19:09 +11:00
Angus Salkeld
1c995a18a0 Add Quantum port tests to improve coverage.
bug 1152445

Change-Id: I6cb5d5dc03e0ed8ffd17cd3e0e2d36e705864bac
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
2013-03-08 23:12:29 +11:00
Angus Salkeld
a95cc1e2fd Add Quantum floating ip tests to improve coverage.
bug 1152445

Change-Id: If72885228f1d7200f7330a093f3c8a08ad1eea96
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
2013-03-08 23:04:32 +11:00
Jenkins
da6d6787a7 Merge "Add tests to validate REST path to action mapping." 2013-03-08 10:43:29 +00:00
Jenkins
2cf859c8b5 Merge "Use quantum IDs for VPC, Subnet, RouteTable resources" 2013-03-08 10:37:17 +00:00