2118 Commits

Author SHA1 Message Date
Jenkins
5994c71c1d Merge "Initial commit for service broker documentation" 2015-10-16 00:19:43 +00:00
Victor Ryzhenkin
51047006e7 Open Mitaka development
Change-Id: Ifcce7866a9ace42f07821165f54021d3909af67f
2015-10-15 22:43:36 +03:00
zhu.rong
2aa9f52d38 Fix a typo in db/catalog/api.py
a typo frn --> fqn

Change-Id: I8c16a7fd5b784e19dd296be339358415d1fb0710
1.0.0 1.0.0.0rc2
2015-10-15 21:14:14 +08:00
zhu.rong
fe6fe4b538 Fix the delete package give the error with """
CLI delete package give the error with """

murano package-delete pakage_id

403 Forbidden: Package is not owned by the tenant
"0c5581f43593479d9c44d9ca1ed1ca69" (HTTP 403)

Change-Id: I4634eaab9eb5a29e70e33214b3a3803e411ec134
Closes-Bug: #1506466
2015-10-15 20:52:33 +08:00
Jenkins
8f25fadf59 Merge "Adds plugin dependency for plugin demo app" 2015-10-15 12:07:02 +00:00
Victor Ryzhenkin
5c2f385fc1 Add test for simple software configuration
- Add application which use simple software configuration feature
- Add test for simple software configuration
- Rework check functions to return response from server

Change-Id: I84941436e7bd72ddf193f5a17fd48789a85a6657
Implements: blueprint dependent-apps-and-ssc-tests
2015-10-15 14:32:12 +03:00
Stan Lagun
55f3c3e5ab Adds plugin dependency for plugin demo app
Change-Id: I1c62a4429ffa7fe1fc9a65e8618c921b46a95b10
Closes-Bug: #1506418
2015-10-15 13:37:24 +03:00
Nikolay Starodubtsev
4268fed77e Initial commit for service broker documentation
In this commit admin guide for murano service broker API added

Change-Id: Ib6414548de4d4217399cff09bb13bd28f20edbbd
2015-10-15 11:30:39 +03:00
Lin Yang
46d993702f Add Apache 2.0 license info to core library
Change-Id: Ifa74af1b7c9f3f7a90273def336932ae67509955
Closes-Bug: #1506102
2015-10-15 15:47:03 +08:00
Jenkins
4119c1b072 Merge "Fixed a typo in example plugin config" 2015-10-14 17:01:41 +00:00
Jenkins
3c99f2b554 Merge "New middleware to handle ssl termination proxies" 2015-10-14 16:23:57 +00:00
Jenkins
908babb9f2 Merge "Introduce MuranoPL/1.1 and 1.2" 2015-10-14 16:23:29 +00:00
Jenkins
5db6aaafa2 Merge "Use migrate command instead of syncdb" 2015-10-14 15:45:04 +00:00
Alexander Tivelkov
e49b22b6b5 Fixed a typo in example plugin config
Wrong config section was returned by the init_config function which
could potentially cause exceptions during plugin loading.
This has been fixed.

Change-Id: I41883507225c8df0a8d0c17c1c3b8dabc66d055b
2015-10-14 18:37:40 +03:00
Jenkins
4001e21fa8 Merge "Increased the number of environments per tenant" 2015-10-14 15:05:07 +00:00
Stan Lagun
aa0e112461 Introduce MuranoPL/1.1 and 1.2
1.1 is the same as 1.0 but packages with format other than
MuranoPL/1.0 (or just 1.0) will be rejected by Murano Kilo.
As a result it will be possible to specify that application
require yaql 1.0 which was introduce in Liberty.

MuranoPL/1.2 differs in that it has yaql legacy mode turned
off and several functions are now cannot be called as
MuranoObject methods. It is recommended to start development
of new applications using 1.2 format

Change-Id: Ie68cc0c37f198c10eeac79ed349f9d9d420e038f
Implements-Blueprint: muranopl-format-version-upgrade
2015-10-14 17:43:24 +03:00
Jenkins
d4dc8740bb Merge "Updated from global requirements" 2015-10-14 13:34:56 +00:00
Nikolay Starodubtsev
8e01d101c7 New middleware to handle ssl termination proxies
Murano doesn't handle request properly if it is behind an SSL
termination proxy. In this case HTTP redirection and returned URLs
use http instead of https.

New middleware helps to handle the situation below properly. The purpose of the
SSLMiddleware is to update the wsgi.url_scheme environment variable of
the request with the value contained in an HTTP header that can be
configured in the configuration file (by default: 'X-Forwarded-Proto')

Closes-Bug: #1504610
Change-Id: Id7cfa1bce00c965b618a4f3e4ca2c915a57bbe52
2015-10-14 14:27:37 +03:00
Jenkins
7ec8bf881e Merge "[Docs] Describe token expiration in troubleshooting" 2015-10-14 09:37:24 +00:00
OpenStack Proposal Bot
91fc86eadf Updated from global requirements
Change-Id: Ieed89584c108ba11f774a3f1ec9a4167c4ee3d67
2015-10-14 09:29:43 +00:00
Ekaterina Chernova
4eeea9883d Use migrate command instead of syncdb
In Django 1.9 syncdb command will be deprecated.
This commit updates CI scripts to prevent a fail
and corresponding docs are updated.

Change-Id: Ief5bba614bdcaecf4c01898b569b0c8d06885242
Closes-Bug: #1505177
2015-10-14 07:14:23 +00:00
Alexander Tivelkov
84bbe9c758 Increased the number of environments per tenant
The 'max_environments' setting of [networking] group in murano
configuration file defines the maximum number of networks which may be
created by murano for any given router, thus eventually limiting the
number of environments to simultaneously co-exists within a tenant.

The previous default (20) was very low, and it was causing CIDR
conflicts even when the actual number of envs was not reaching the
limit.

This change increases the number of CIDRs allowed for environment
networks, thus reducing the probability of CIDR conflict.

NOTE: This change just reduces the risk of conflicts but does not
eleminate it completely.

Change-Id: Id913d17b8f7207afc9b1983287349a6d70a09edf
Partial-bug: #1502437
2015-10-13 20:31:05 +03:00
Jenkins
da57fe2b34 Merge "Updated from global requirements" 2015-10-13 15:27:04 +00:00
Jenkins
fbccaee76d Merge "Fix typos in Murano PL Reference" 2015-10-13 14:48:25 +00:00
Jenkins
6004f30d25 Merge "Fix typos in developer documentation" 2015-10-13 14:48:21 +00:00
Jenkins
aeef30f7ed Merge "Fix a typo in Quickstart guide" 2015-10-13 14:47:43 +00:00
OpenStack Proposal Bot
29131ee37f Updated from global requirements
Change-Id: Ie670ed8a3ed1ad30a2c422e8cf813341300a6e7b
2015-10-13 11:01:15 +00:00
Jenkins
121e2f6674 Merge "[Murano Docs] Application topology" 2015-10-13 10:30:41 +00:00
Hironori Shiina
52f3865eca Fix typos in Murano PL Reference
Fix 2 typos in Murano PL Reference.

Change-Id: I33caf1fe5e349b2e56c766de99a82c74b825c987
2015-10-13 04:27:07 +00:00
Hironori Shiina
f88c249664 Fix a typo in Quickstart guide
Fix a typo in Quickstart guide.

Change-Id: I8836d19be96346adcc1419acbe37e50ed330f9d7
2015-10-13 04:09:05 +00:00
Hironori Shiina
ad665cbae2 Fix typos in developer documentation
Fix 2 typos in the developer documentation 'Architecture'.

Change-Id: I197b50f5619b6cbfba5eaa8cfdf33a77bcf8270f
2015-10-13 02:57:29 +00:00
Jenkins
6958b1d9d5 Merge "Do not try to delete server from deleted Heat stack" 2015-10-12 15:32:10 +00:00
Jenkins
e4a8eefd2d Merge "Makes conditional expressions consistent with yaql 1.0" 2015-10-12 15:32:02 +00:00
Maria Zlatkova
bdf438f7e0 [Murano Docs] Application topology
Adds a HowTo instruction into the "Show an application topology"
section of the End User Guide.

Change-Id: I05f744ae7392cddc4dd1ea33f8229f947d49f291
2015-10-12 15:04:40 +00:00
Jenkins
f89565912e Merge "Made service broker to handle asynchronous request" 2015-10-12 14:42:23 +00:00
Jenkins
2009b0dfd5 Merge "[test runner] Support --config-file option" 2015-10-12 13:57:10 +00:00
Jenkins
171894ef52 Merge "Add dependent application test" 2015-10-12 13:56:57 +00:00
Alexey Deryugin
0b4989290a Change the way devstack configures murano-dashboard
Due to change in horizon settings file, we need to change
the method of murano-dashboard configutration. Murano dashboard lib
will now put config into local_settings.py file of Horizon.

Change-Id: Ibeab0e65c82eccb31a39373cdc2de5e409087806
Closes-Bug: #1505208
2015-10-12 11:57:51 +00:00
Stan Lagun
e6b7ccb898 Do not try to delete server from deleted Heat stack
Because now Environment's .destroy method would
be called before that of an Instance the later will try
to delete itself from the stack that is physically not
existing and represented as an empty dictionary in
HeatStack.current().

With this change Instance will check stack existence
before deleting anything.

Also a method to check if Instance is present in Heat
stack template was added so that application could check
if it is safe to use the instance (for example to send Agent plans)

Change-Id: I298f3f079a153ef87ed7213b7f1432c9e5e4b4b6
Closes-Bug: #1503715
2015-10-09 22:35:01 +00:00
Stan Lagun
99c01e783f Makes conditional expressions consistent with yaql 1.0
Allow non-boolean expressions as an argument to If/While/Switch.

Change-Id: I83132c511a3863d4ee1fbe4c2242034f9d47f351
Closes-Bug: #1504668
2015-10-09 23:35:00 +03:00
Jenkins
bcc56b103a Merge "Incorrect yaql engine was used for MuranoPL/1.0" 2015-10-09 16:49:00 +00:00
Jenkins
256bb98102 Merge "Return full structure of std info in Linux class methods" 2015-10-09 16:35:09 +00:00
Ekaterina Chernova
db87f545e4 [Docs] Describe token expiration in troubleshooting
Change-Id: Ie36710958bf178141b69894cbdb1a407fe92bf5b
2015-10-09 19:16:28 +03:00
Stan Lagun
838084ccdc Incorrect yaql engine was used for MuranoPL/1.0
Change-Id: I46ceeb9190f82a26b9cb8cdced1e4bc205e3bc5a
Closes-Bug: #1504336
2015-10-09 17:02:07 +03:00
Ekaterina Chernova
d8fc56c725 [test-runner] Register test-runner system class automatically
Change-Id: I99c345eb2afb9a28ef3c0481d230fc2b2ba7cbee
2015-10-09 13:35:12 +00:00
Dmytro Dovbii
0c755f672f Return full structure of std info in Linux class methods
This patch adds to 'putFile' and 'runCommand' methods ability to return
full structure containing stdout, stderr and exitcode instead of
returning just exitCode, which worked incorrectly.

New optional parameter 'options' was added to allow specifing custom
options execution plans.

Change-Id: Icb2b9c5cc72a4555ccee85c471547041be86e2fc
Closes-Bug: #1504211
2015-10-09 15:44:37 +03:00
Nikolay Starodubtsev
6319b4f58f Fix obsolete imports in functional tests
isolated_creds was renamed to dynamic_creds in murano functional
tests. Also, update class names.

Change-Id: I3596a80925dde388dcb69a37ee4fd0343849b352
Closes-Bug: #1504508
2015-10-09 14:58:17 +03:00
Jenkins
09ff410d6e Merge "Make test_package_is_not_provided less strict" 2015-10-09 09:45:24 +00:00
OpenStack Proposal Bot
e14c2fd49d Updated from global requirements
Change-Id: Ia594859a45324dc8d0fcef609f9a2363ffe5ce35
2015-10-09 05:00:56 +00:00
Ekaterina Chernova
2ef888d036 [test runner] Support --config-file option
Previously, if --config-file option was provided, it was not applyed
since CONF variable was not initialized.

Change-Id: I3f8d860d3f974e89190bdfd5b2c2be1c464d2ec7
Closes-Bug: #1504125
2015-10-08 17:54:04 +03:00