summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix stack update issue"2015.1.0rc1proposed/kiloJenkins2015-04-072-1/+29
|\
| * Fix stack update issueEthan Lynn2015-04-022-1/+29
| | | | | | | | | | | | | | | | Different type of resource with same name should consider to be a new resource when stack-update. Change-Id: I102ffbd1a1562c164f43969c87570096c280738a Closes-Bug: #1404201
* | Merge "Do not resolve neutron resource attributes when resource_id is None"Jenkins2015-04-062-9/+16
|\ \
| * | Do not resolve neutron resource attributes when resource_id is NoneRandall Burt2015-04-032-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | Also, fix the test to correctly account for NotFound as well as this new case. Closes-Bug: 1440189 Change-Id: I31004c11af71e32a4388fd44cd8b98df8afbd1a5
* | | Merge "Imported Translations from Transifex"Jenkins2015-04-063-81/+100
|\ \ \
| * | | Imported Translations from TransifexOpenStack Proposal Bot2015-04-063-81/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For more information about this automatic import see: https://wiki.openstack.org/wiki/Translations/Infrastructure Change-Id: Id2f3bc50ec342681224dd77122176bb380d12966
* | | | Merge "Fix functional test_signal_during_suspend"Jenkins2015-04-061-0/+1
|\ \ \ \
| * | | | Fix functional test_signal_during_suspendPavlo Shchelokovskyy2015-04-061-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With some particular timing the stack returned by stack.get() is still in SUSPEND_IN_PROGRESS and lacks `outputs` attribute. Wait not only for nested stack to go to SUSPEND_COMPLETE, but for parent stack too. Change-Id: I8248146089f517c89f19321b796bfe750b14983b Closes-Bug: #1440653
* | | | Merge "Updated from global requirements"Jenkins2015-04-061-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Updated from global requirementsOpenStack Proposal Bot2015-04-031-1/+1
| | | | | | | | | | | | | | | | Change-Id: I9251ecebd11f092194d40ef05f18fe73e2c9a64c
* | | | Merge "Set stack status to FAILED when engine is down"Jenkins2015-04-037-0/+112
|\ \ \ \ | |_|/ / |/| | |
| * | | Set stack status to FAILED when engine is downEthan Lynn2015-04-027-0/+112
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | When stack is in status IN_PROGRESS and engine service went down, the status of stack will forever remain in IN_PROGRESS. This patch add a db apid to get engine_id from stacklock and try to reset the stack status to FAILED when engine is back. Closes-Bug: #1382320 Change-Id: Ica856bb0d56c23a4423fb9476c1986aaacf24108
* | | Merge "Do sleep(0) for first task sleep"Jenkins2015-04-032-10/+11
|\ \ \ | |_|/ |/| |
| * | Do sleep(0) for first task sleepSteve Baker2015-04-022-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | This results in a functional test run which is up to 20% faster than the current sleep(1) Closes-Bug: #1439216 Change-Id: I1f594963dd164e44b8d9c601610a4036a0253ece
* | | Merge "Fix stack-update for OS::Nova::Server resource"Jenkins2015-04-022-12/+90
|\ \ \
| * | | Fix stack-update for OS::Nova::Server resourceRabi Mishra2015-04-022-12/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes stack-update for `OS::Nova::Server` resource, when network name rather than network id is used. Change-Id: I484f7f8890485eca42eaa31e034f6d19b369c72a Closes-Bug: #1439071
* | | | Imported Translations from TransifexOpenStack Proposal Bot2015-04-0210-519/+481
| |_|/ |/| | | | | | | | | | | | | | | | | For more information about this automatic import see: https://wiki.openstack.org/wiki/Translations/Infrastructure Change-Id: I94e5755be50ad2baf8bbad9d9b802a5eb49fad7f
* | | Merge "Ignore migrating environments for deleted stacks"Jenkins2015-04-022-17/+28
|\ \ \
| * | | Ignore migrating environments for deleted stacksRandall Burt2015-04-012-17/+28
| | |/ | |/| | | | | | | | | | Change-Id: I50b7a0f309922aa3c6ef63b9d27282e2adae4a6e Closes-Bug: 1432795
* | | Merge "Create an event when signalling fails"Jenkins2015-04-023-2/+12
|\ \ \
| * | | Create an event when signalling failsAngus Salkeld2015-04-023-2/+12
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | - otherwise it is hard to know that signalling happened and failed - remove the LOG.exception() - doesn't seem like a programming error. - don't change the resource action/state - this makes a functional test much more reliable Change-Id: I84c73b06bade4dfcadba240eb3dddac698194acf Partial-bug: #1334333
* | | Merge "Correctly initialize copies of stack during updating stack"Jenkins2015-04-025-35/+212
|\ \ \ | |/ / |/| |
| * | Correctly initialize copies of stack during updating stackDeliang Fan2015-03-315-35/+212
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass stack_user_project_id to updated_stack, backup_stack and oldstack to make sure the success when deleting stack domain user. Create a common method to get the kwargs to create a stack from an existing stack. Co-Authored-By: Angus Salkeld <asalkeld@mirantis.com> Change-Id: Ieb7726ed738d5ae8046184f312379b9132b6c4a9 Closes-Bug: #1356084
* | | Merge "Fixes migrate_data utils to avoid created_at filed"Jenkins2015-04-012-3/+55
|\ \ \
| * | | Fixes migrate_data utils to avoid created_at filedKanagaraj Manickam2015-04-012-3/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | migrate_data utils does not migrate table data if table does not have column created_at field. It fixes this issue. Change-Id: Id179b295d8f0e0644420fb589baa5341d3020c7f Closes-bug: #1439094
* | | | Merge "Updates migrate_repo README"Jenkins2015-04-011-1/+1
|\ \ \ \
| * | | | Updates migrate_repo READMEKanagaraj Manickam2015-04-011-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sqlalchemy migrate utility is being maintained by Openstack Stackforge project, which was maintained by google earlier. So the README is updated with Stackforge project url. Change-Id: I824d2ede84da8dd8a1488c0ca5e3ee0a71fb7810 Closes-bug: #1439023
* | | | Merge "Re-factor db sqlalchemy tests"Jenkins2015-04-014-65/+46
|\ \ \ \
| * | | | Re-factor db sqlalchemy testsSergey Kraynev2015-03-314-65/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Heat repository already contains sub-directory tests/db/. In this patch we move all related with db sqlalchemy tests to mentioned sub-directory. Also was removed redundant copy of file heat/tests/test_sqlalchemy_types.py. Code from this file was migrated to heat/tests/db/test_sqlalchemy_types.py file. Change-Id: I337eeedc079e1146958ec3b4b1956d76ce7fc352
* | | | | Merge "Use HeatTestCase as parent instead of testtools"Jenkins2015-04-0111-40/+30
|\ \ \ \ \ | |/ / / /
| * | | | Use HeatTestCase as parent instead of testtoolsSergey Kraynev2015-03-3111-40/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's use base class for test, which allows to write scenarious tests in child clases. Change-Id: I8276513d6ce5a83ce1b46ff3107cc0e3223d9b4d
* | | | | Merge "Add separate requirements.txt to integration tests"Jenkins2015-04-013-2/+25
|\ \ \ \ \
| * | | | | Add separate requirements.txt to integration testsPavlo Shchelokovskyy2015-04-013-2/+25
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and use it during tox run. This should speed up the tox venv creation somewhat, as the new requirements is shorter, thus less packages are installed or C extensions compiled. Also this is the first step to ease packaging of the integration tests as a separate tool. Change-Id: I914eb675e7f025e03a22719d5dff8ed741fbd37d
* | | | | Merge "Prove that we can't signal during a suspend"Jenkins2015-04-011-0/+28
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Prove that we can't signal during a suspendAngus Salkeld2015-04-011-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to just make sure that bug 1334333 is fixed. Change-Id: I7a54e7f089b247997fb5cc5e696629f6415d009f Partial-bug: #1334333
* | | | | Merge "Fix typo in doc"Jenkins2015-04-011-3/+3
|\ \ \ \ \
| * | | | | Fix typo in docEthan Lynn2015-04-011-3/+3
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Correct description of FnGetAtt in pluginguide. Change-Id: I3108464d057c9607814ff1bfc394367540cd6765
* | | | | Merge "OS::Neutron::Port default replacement_policy=AUTO"Jenkins2015-04-011-1/+1
|\ \ \ \ \
| * | | | | OS::Neutron::Port default replacement_policy=AUTOSteve Baker2015-04-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that nova bug 1158684 has been fixed heat can assume that a port won't be deleted by nova during a stack update. REPLACE_ALWAYS as a default caused its share of issues, including servers not handling the port churn on stack updates. REPLACE_ALWAYS is left as an option for standalone heat orchestrating older OpenStack releases. Change-Id: Ie9b2ebe8b29bd5ed6006dfb59c6dccd4a595832f Closes-Bug: #1393376 Related-Bug: #1158684
* | | | | | Merge "Move provider_net test to separate file"Jenkins2015-04-012-155/+175
|\ \ \ \ \ \
| * | | | | | Move provider_net test to separate fileSergey Kraynev2015-03-272-155/+175
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also template were updated in tests. Change-Id: I5dc8db849829e3e5ea0b5f942ac25fc5e2b7149b
* | | | | | | Merge "Move generic resources to properties schema"Jenkins2015-04-011-9/+11
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Move generic resources to properties schemaPeter Razumovsky2015-03-301-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not all resources in generic_resources file on properties schema. Use properties.Schema instead of dictionary. Change-Id: I558b33c304f38a5819b7b54c780181430ee7b1be
* | | | | | | Merge "Set state to failed if we get a base exception"Jenkins2015-03-312-3/+37
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Set state to failed if we get a base exceptionAngus Salkeld2015-03-272-3/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The scheduler only raises ExceptionGroup if aggregate_exceptions is True. This change adds a catch-all exception handler that sets the stack to failed on any exceptions. Co-Authored-By: Miguel Grinberg <miguel.grinberg@gmail.com> Change-Id: I76a6e87924416335921115ec3147a991659cfb2e Closes-Bug: #1436128
* | | | | | | Merge "Move router tests to separate file"Jenkins2015-03-312-838/+866
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Move router tests to separate fileSergey Kraynev2015-03-272-838/+866
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also templates were updated. Change-Id: If348fb0a151fbb396b77677abfb72fba96a07955
* | | | | | | Merge "Change the default num_engine_workers to get_worker_count()"Jenkins2015-03-313-2/+6
|\ \ \ \ \ \ \
| * | | | | | | Change the default num_engine_workers to get_worker_count()Angus Salkeld2015-03-313-2/+6
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we have decouple-nested merged, it makes sense to enable more workers. oslo has a function just for this processutils.get_worker_count() Also set the number to 2 for functional tests to not overly consume too much memory but still test the multi worker path. Change-Id: I86d1e8bb1813ccdee959f7a0fe78867dde7d21b5 Closes-bug: 1434339
* | | | | | | Merge "Move floating ip test to separate file"Jenkins2015-03-312-705/+663
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
View Lorry Controller Status