743 Commits

Author SHA1 Message Date
Jenkins
ab1c1b0ccc Merge "Fixed name of the log file on VM" 2014-04-23 09:05:06 +00:00
Jenkins
9c7fc4adde Merge "Fix murano-manage import-package" 2014-04-22 17:27:59 +00:00
Jenkins
c5860f7778 Merge "Fix issue with keystone" 2014-04-22 17:06:16 +00:00
Serg Melikyan
a72df283e2 Fix issue with keystone
Change-Id: Idfeb08fe6946c06b8e6ee933a8ac4b6d62f4406e
Closed-bug: #1310615
2014-04-22 18:55:36 +04:00
Serg Melikyan
ca9aae1554 Fixed name of the log file on VM
Small fix for images with pre-created /etc/murano directory

Change-Id: Ie5738b89efba7619f0d4e30500407ff0daea4f6a
2014-04-22 18:45:55 +04:00
Timur Sufiev
90682fb378 Fix murano-manage import-package
Attribute 'class_definition' was renamed to 'class_definitions', but
that change hadn't make it there.

Change-Id: I5e4e71ee89030c3e627d6127cf73fb1f70ca325e
2014-04-22 18:10:57 +04:00
Jenkins
20905c2591 Merge "Launch murano-engine with Murano services" 2014-04-22 10:59:25 +00:00
Jenkins
59abd06421 Merge "Add file limit for a package archive during upload" 2014-04-22 09:22:58 +00:00
Jenkins
dbf9f630e2 Merge "Set a proper name for murano config section" 2014-04-22 09:15:37 +00:00
Dmitry Teselkin
1bf8ad2698 Launch murano-engine with Murano services
Change-Id: I84e72d9c89fbcf812ea57030704287791b5a02c2
2014-04-22 11:57:16 +04:00
Ekaterina Fedorova
14347f9514 Add file limit for a package archive during upload
Change-Id: I2cc5c13f486fc3fc1cc27f375ffc53b2193f62c3
2014-04-22 11:33:19 +04:00
Alexander Tivelkov
6e7b664d34 Set a proper name for murano config section
Change-Id: I931aed9f5d970a18ab377b059d5cfb3bcfd02021
Closes-bug: #1310722
2014-04-21 21:45:59 +04:00
Jenkins
727dd58e9b Merge "Fixed incorrect instantiation of Resources class" 2014-04-21 13:38:51 +00:00
Jenkins
468208371e Merge "Add CPU info to stats" 2014-04-21 13:22:42 +00:00
Jenkins
51ddaac328 Merge "Added a CLI command to manage categories" 2014-04-21 11:54:22 +00:00
Jenkins
440f28946c Merge "Wrong Usage for dns_ip property in AD PrimaryController" 2014-04-21 11:01:38 +00:00
Jenkins
0cd0130954 Merge "Typo in HeatStack API" 2014-04-21 11:00:32 +00:00
Jenkins
9e5acc61db Merge "DirectoryPackageLoader skipped all package directories" 2014-04-21 10:58:53 +00:00
Jenkins
94af0bcb36 Merge "Use io.BytesIO instead of sqlalchemy.byte_buffer" 2014-04-21 10:47:33 +00:00
Jenkins
1b7d3b0bbd Merge "Heat stack could remain even if all applications were removed" 2014-04-21 10:42:26 +00:00
Jenkins
1d13e05900 Merge "AD was broken because of missing Body key" 2014-04-21 10:40:49 +00:00
Jenkins
3e05fa6e66 Merge "Rename Type to Usage for MuranoPL properties" 2014-04-21 10:38:29 +00:00
Jenkins
e3f10c954b Merge "Fix missing function error in install_venv" 2014-04-21 10:20:25 +00:00
Jenkins
8c5d7f6d2b Merge "Bump python-muranoclient version to 0.5.0" 2014-04-21 09:53:25 +00:00
Jenkins
c92dd87549 Merge "Remove hardcoded foreign keys from db.catalog.api" 2014-04-21 09:39:23 +00:00
Jenkins
3912adc1cf Merge "Preserve keys in object's system area" 2014-04-21 09:35:44 +00:00
Stan Lagun
02003db798 Fixed incorrect instantiation of Resources class
Change-Id: I8b2c530ae9450165e084f769035a78552ca8d9ce
2014-04-21 12:50:12 +04:00
Stan Lagun
11bdc79d24 Heat stack could remain even if all applications were removed
Closes-Bug: #1308910

Change-Id: I03b8ec9597575a9be5eec7a79ace7c7e74a3d775
2014-04-21 03:07:44 +04:00
Stan Lagun
a95da442ff Wrong Usage for dns_ip property in AD PrimaryController
Change-Id: I45cf5e723ba685421be3603654c21c41426875ff
2014-04-21 02:59:47 +04:00
Stan Lagun
058fd934c6 Typo in HeatStack API
Change-Id: I7964b797f967e43384695d4d72b3025e34eadbaa
2014-04-21 01:10:13 +04:00
Stan Lagun
818ca58172 DirectoryPackageLoader skipped all package directories
Change-Id: I16aeb405e3f588ad4cfd41429375f0f2634dfb6c
2014-04-21 00:29:47 +04:00
Stan Lagun
d341a0e778 AD was broken because of missing Body key
Change-Id: I66b9c2e60348b37eda717644423129a6da9f3677
2014-04-21 00:23:46 +04:00
Stan Lagun
c4266d89df Rename Type to Usage for MuranoPL properties
Change-Id: Ide9368fd57d3322476d59c7d4cbb83d59736f664
Closes-Bug: #1308924
2014-04-20 23:06:49 +04:00
Ruslan Kamaldinov
d6efb62c21 Added a CLI command to manage categories
Added two new commands:
* category-list
* category-add

Usage examples:
$ murano-mange category-list
$ murano-manage category-add NAME_OF_THE_NEW_CATEGORY

Change-Id: I98efc6749fa74e74584c5ec8b1741a297cd4660d
2014-04-19 20:01:40 +04:00
Ruslan Kamaldinov
002ba1a026 Bump python-muranoclient version to 0.5.0
Change-Id: I89de484f9ae5f05f45235d78ae66597a8c4cf155
2014-04-19 20:00:09 +04:00
Steve McLellan
68441ce095 Use io.BytesIO instead of sqlalchemy.byte_buffer
application_package uses byte_buffer to write an in-memory
zipfile. byte_buffer wasn't introduced into sqlalchemy until
v0.9 as part of the python3k compat changes. Patch changes
application_package to use io.BytesIO instead.

Alternative is to change the sqlalchemy and -migrate package
versions.

Change-Id: I59f23d2ed4e37063dca4d2a70e9f6184bd0e0aeb
Closes-Bug: 1309743
2014-04-18 15:59:37 -05:00
Jenkins
bd7a820fd0 Merge "Configure rabbit vhost for Murano" 2014-04-18 13:43:39 +00:00
Stan Lagun
33a374d181 Preserve keys in object's system area
Sub-keys in object's system area ('?') are no longer
deleted after deployment

Change-Id: Ieae7a472fa25df56d19fad6b1d604122ebd98aa5
Closes-Bug: #1308923
2014-04-18 16:23:10 +04:00
Jenkins
b102f33466 Merge "Fix for package import" 2014-04-18 08:57:26 +00:00
Dmitry Teselkin
f7fd7b7902 Configure rabbit vhost for Murano
MURANO_RABBIT_VHOST allows to specify a separate virtual host for Murano services.

This is not required if all OpenStack services are deployed by devstack scripts
  on a single node. In this case '/' virtual host (which is the default) is enough.

The problem arise when Murano installed in 'devbox' mode, allowing two or more
  devboxes to use one common OpenStack host. In this case it's better devboxes
  use separated virtual hosts, to avoid conflicts between Murano services.

This couldn't be done using exitsting variables, so that's why this variable was added.

Change-Id: Ib9cfc6b23afc0362226b3e2a891befba7595f776
2014-04-18 12:37:05 +04:00
Ankur Rishi
873addf1e9 replace reference to ._items w/ call to .items()
Change-Id: I6c8d6e328b30220ab9845dd79a7fc99ffc001024
Closes-Bug: #1309240
2014-04-17 16:47:54 -07:00
Jenkins
28bf301221 Merge "Default MuranoPL function argument value was evaluated incorrectly" 2014-04-17 17:27:46 +00:00
Georgy Okrokvertskhov
26233e56c7 Add CPU info to stats
This patch adds a cpu info to api server stats.
Adds a new requirement psutils

Change-Id: I5644c74b8c22450df0d431e03acb6923d8c15873
2014-04-17 09:44:14 -07:00
Timur Sufiev
a601d57adc Fix class FQNs for Active Directory in Dynamic UI
Change-Id: I54889acfedb1ac0d47e8395bb7c871c632b6e79e
2014-04-17 12:34:17 +04:00
Jenkins
4feae463f9 Merge "Update requirements.txt due to changes in global-requirements.txt" 2014-04-16 20:32:30 +00:00
Jenkins
5199f1dd28 Merge "Typo in murano-api.conf" 2014-04-16 20:32:01 +00:00
Ankur Rishi
69396e7533 Fix missing function error in install_venv
The previous commit, 3362ee1337d47ab8930407c58311a811d471a7a4,
a sync with Openstack Common, removed all definitions of the
post_process() function from the Distro class and all of its
child classes in install_venv_common.py.

This fix simply removes the call to the function in
install_venv.py

The issue is similar to #1263940 in tempest:
https://bugs.launchpad.net/tempest/+bug/1263940

Change-Id: Iedd0c29789c4b2ab9be880f9bd320b39a9bdd277
Closes-Bug: #1307705
2014-04-16 19:59:54 +00:00
Jenkins
a0a19a9a46 Merge "Add 'cp' of murano-dashboard lib file in devstack README" 2014-04-16 17:35:19 +00:00
Jenkins
47b5afc83a Merge "Handle unicode strings in merge-dict" 2014-04-16 17:10:53 +00:00
Jenkins
7a05786496 Merge "Replace 'applications' in deployments data with 'services'" 2014-04-16 17:08:09 +00:00