Commit Graph

101 Commits

Author SHA1 Message Date
zhurong 4c2f898b4a Use uwsgi binary from path
Change-Id: I553265e5ef99ed1e5a3baedb123241e666c819ca
2020-06-16 11:29:09 +08:00
zhurong 3afc74b1ca Add --procname-prefix for uwsgi murano-api
Change-Id: I62f4f09ac48c19e57af9a1ade26783cbf74b9feb
2019-12-01 23:29:42 -08:00
Ghanshyam Mann 35066cca45 [train][goal] set default dns for IPv6 env
'MURANO_DEFAULT_DNS' is hard coded for IPv4 default dns.
For IPv6 env, we need to set it to ipv6 default dns.

Change-Id: Ie01b9ccc3ce1ca538142a49dc107f742252e46b8
Story: #2005477
Task: #35907
2019-08-16 10:38:28 +00:00
zhurong 9c7fa9048c Fix IPV6 rabbit host
Change-Id: Id21850ce27f596d7bacc54fdccbaca766b40b568
2019-08-08 01:23:59 +00:00
zhulingjie ecf8effdfa Replace git.openstack.org URLs with opendev.org URLs
Thorough replacement of git.openstack.org URLs with their opendev.org counterparts.

Change-Id: Id506aad04b878ba516872ef0169664f47f6eaab0
2019-06-25 14:43:40 +08:00
Ian Wienand 003b9eaff6 Replace openstack.org git:// URLs with https://
This is a mechanically generated change to replace openstack.org
git:// URLs with https:// equivalents.

This is in aid of a planned future move of the git hosting
infrastructure to a self-hosted instance of gitea (https://gitea.io),
which does not support the git wire protocol at this stage.

This update should result in no functional change.

For more information see the thread at

 http://lists.openstack.org/pipermail/openstack-discuss/2019-March/003825.html

Change-Id: I3e3db24e56cffd7eb682d720f0496c90264b0b60
2019-03-24 20:34:17 +00:00
Zuul 8eff339106 Merge "Add grenade job" 2019-01-23 06:41:23 +00:00
zhurong f2ade017d4 Add grenade job
Depends-On: https://review.openstack.org/632404
Change-Id: I54b191faf9c2ddedfd574121f59bf7cc45faa90f
2019-01-23 02:27:01 +00:00
zhurong 5fbd61d03c stop murano-api process
Change-Id: I68e0a98108df918dd5e1bcf81b2d54ac33d5538b
2019-01-22 18:44:38 +08:00
zhurong 22f4d6df5e Remove set GLARE_API_URL for horizon
In multi-region, only have one horizon, so we can not
set GLARE_API_URL parameter for horizon.

Change-Id: Ia39d7d1940dcac31467fbe73f7268cf1f3d39ddf
Closes-Bug: #1630318
2018-07-27 15:59:38 +08:00
wu.chunyang 7a64448917 Update auth_uri option to www_authenticate_uri
Option auth_uri from group keystone_authtoken is deprecated[1].
Use option www_authenticate_uri from group keystone_authtoken.

[1]: https://review.openstack.org/#/c/508522/

Change-Id: Ib8623a359a27b8a4aa90bf69a3fe3f3a5c2411a6
2018-05-12 06:34:14 +00:00
chao liu 3186a72942 use . instead of source.
Code conventions: Use “.” to source script files
When you have to source a script file, for example,
a credentials file to gain access to user-only or
admin-only CLI commands, use . instead of source.
See more:
http://docs.openstack.org/contributor-guide/writing-style/code-conventions

Change-Id: Ia823df50f65b26695458a509a0e0d94a4646afb3
2018-02-10 03:00:30 +00:00
zhurong 15c474e3f1 Configure murano dashboard selenium tests configuration
This configuration will be used for murano dashboad selenium tests

Partially Implements: blueprint dashboard-selenium-tests-migrate-to-infra-ci

Change-Id: I12cf2dbc62a25c1a56f7f0f7d54b7df412c2b397
2018-01-11 10:29:11 +08:00
zhurong 05d95df793 Murano tempest job with separate tempest plugin
Change-Id: If7136dbfaa53c1835adbd009206fe3baac1b1e16
2017-12-06 14:48:39 +08:00
zhurong 35d7ef42b6 Remove download murano images from app.openstack.org
Due to app.openstack.org website is down, we can not get the images
from there, so remove download murano images.

Change-Id: Iba4525ab35a679c18b4ae59df3373a30e9d41f02
2017-09-27 06:20:25 +00:00
zhurong efbe5ca5d1 Deploy murano-api via uwsgi
The patch add the devstack install murano-api via uwsgi.

Implements: blueprint murano-api-wsgi
Change-Id: I3b83a0295cf60de24ff90cabfcbbc3cfb0171905
2017-08-15 14:02:03 +08:00
zhurong 11167e829e Using oslo generator config file generate murano config
Change-Id: I0ebbe4349960119854151875fdea458b0a142053
2017-08-10 15:14:06 +08:00
Jenkins 80b8861594 Merge "Update the documentation link for doc migration" 2017-08-01 01:25:38 +00:00
Hangdong Zhang 4ecefa3a0b Update the documentation link for doc migration
Change-Id: I6a127e1194702cf2a158e1bbe6eb6ce6cadac386
2017-07-31 16:54:11 +08:00
Gyorgy Szombathelyi 25317e3801 Fix murano_auth usage
Use the OpenStack standard keystoneauth1 library for loading
authentication plugins and register their options in the
murano_auth section.
Still provide a fallback if no murano_auth.auth_type is specified
to make old config files work.

Closes-bug: 1705838
Change-Id: Ie74364a4401f64fe42bf2206b6df760d2fc60edb
2017-07-27 12:40:14 +02:00
zhurong df8002303f Make murano user has admin role
murano user will as the trustee user, need have privilege to get_project,
So need the the admin role.

Change-Id: Ie1c876675322e31349c9815fa45e15128eb4856d
Closes-Bug: #1702594
2017-07-06 10:43:45 +08:00
Felipe Monteiro fb1a2d5bbe Remove murano default policy.json
This commit removes the murano default policy.json file from
etc/murano and references to it in murano's devstack plugin.
(References to the policy.json in muranodashboard remain
the same).

This commit specifically:
  - removes the default policy.json
  - removes references to it in devstack plugin
  - adds base rules to murano.common.policies.__init__ because
    they are the last rules to be included
  - updates base admin_api rule to is_admin:True from
    is_admin:1 (because the latter was causing issues)
  - updates Murano policy documentation

Partially Implements: blueprint policy-in-code
Depends-On: Ia372983d2bd1010cd19f04061f3276ed16e9c1c9
Change-Id: I1a8581a559e4333a74d56a5bdce7e6d1f117907d
2017-06-16 03:07:49 +00:00
zhurong 924b68b57a Using run_process instead of screen_it
Using the old screen_it murano service can not managed by
systemd, so use run_process instead of screen_it

Change-Id: I64aba918022966d8c55d0380e7fdc8e179532024
2017-05-11 14:33:41 +00:00
Artem Tiumentcev 805ff6066e Install devstack with murano on Python 3
Change-Id: I5637f1bdb14bfdd9f9c832d295a7b0f25b16b7bc
2017-04-26 16:33:21 +03:00
zhurong 75b47bbabd Make murano auth with murano_auth section instend of keystone_authtoken
This patch add a murano_auth for murano auth with keystone,
This gives ability to fine-tune role-based privileges for
service-user going to execute trust-delegated tasks and the auth
configuration properties do not need to change when keystonemiddleware
deprecates its configuration properties.

Closes-Bug: #1643583
Closes-Bug: #1658648
Change-Id: If10fa8c938c264c7b5cadb3c3ed77f39488dcab7
2017-04-21 10:37:44 +08:00
Kirill Zaitsev 7b88dcf977 [devstack] Remove all the dashboard config files
This change accompanies I7aee5d26185cc0a7bb54f2b39b85d580daa400ae and
makes devstack plugin correctly cleanup all the config files installed
by new murano-dashboard.

Also cleans-up any occasional .pyc/.pyo files.

Depends-On: I7aee5d26185cc0a7bb54f2b39b85d580daa400ae
Targets bp: catalog-dashboard-reorg
Co-Authored-By: zhurong <aaronzhu1121@gmail.com>

Change-Id: I53cd9ee0a64aa6771597144317d126b88fcde989
2017-03-23 10:11:06 +08:00
Serg Melikyan 53af1f4485 Remove heat as enable_service in devstack
Now that heat is available as a devstack plugin, we should
use it. In-tree devstack code for heat is planned to be
removed soon.

Co-Authored-By: zhurong <aaronzhu1121@gmail.com>
Depends-On: I505a308de751bf8c35b921659e8eeb36cc2fb9a9
Change-Id: I3def7bfb026a15cf0d7a9ee6683b5f8abc1f6c32
2017-02-02 22:36:33 +08:00
Aleksandr Kholkin 190a191c99 'io.murano.apps.' is not used to download packages
'io.murano.apps.package' was replace by 'com.example.package' in a.o.o.
https://review.openstack.org/#/c/330734/

Change-Id: Ia6489b06ca55174eb102d18f0958fcf78d421490
2017-01-30 13:40:00 +00:00
zhurong 62843716c2 Remove ALLOWED_HOSTS using murano devstack plugin
Since devstack had always set ALLOWED_HOSTS=['*'] for horizon in this patch
I0ab2b57e459dbfa3b01b3e9388bbcefac076a142
So remove this setting from murano devstack plugin

Change-Id: I4a12904096e2cc3f64f82ec04518f709643c2001
2016-12-28 19:04:30 +08:00
Victor Ryzhenkin a8615d98de Use test-config phase for configuring murano tempest
Since tempest removing its config due installation we need to
move our tempest config phase into test-config instead of extra
to avoid misconfigured tests on the end.

Change-Id: I2a1d6a9b266f0d3fb0ba90d5761844909668e4b7
2016-12-17 05:52:58 +04:00
Alexander Tivelkov 3a18488cf4 Revert "Update devstack keystone_authtoken config to fit with keystone v3"
This reverts commit df8bf9c8f8.
That patch renamed keys of the configuration properties of the
keystone_authtoken settings group, thus breaking config file
compatibility.

Change-Id: I8fd3b3211e75207cf6061eef6f038ea045d9dbfe
2016-11-23 15:52:01 +00:00
Victor Ryzhenkin 05074a4512 Fill ALLOWED_HOSTS using murano devstack plugin
Change-Id: I79f894ffd6002b4c53043101db8f8f8fc5f1abff
2016-11-07 11:40:55 +00:00
Jenkins e2f02a0293 Merge "Update devstack keystone_authtoken config to fit with keystone v3" 2016-11-02 18:47:28 +00:00
zhurong df8bf9c8f8 Update devstack keystone_authtoken config to fit with keystone v3
Now murano can not auth when only using keystone v3,
this commit update the devstack config to fix with keystone v3.

Closes-bug: #1633394
Change-Id: Ie6a2ccdf6121b3badd403a1c08f1e91052e8c4dc
2016-10-19 02:17:04 +00:00
Victor Ryzhenkin f547dff5c4 Repair cinder integration tests
- Use image from nova scenario tests for cinder tests
- Correct environment status wait function
- Replace backup waiters with new tempest changes
- Use devstack trueorfalse common function to determine
boolean values

Closes-Bug: #1626872

Change-Id: Id2172d3d9b314eb8132d97ec8868028c714a35c3
2016-10-17 16:50:33 +03:00
Jenkins 2d70b402c1 Merge "Remove networking config section from devstack settings" 2016-09-27 09:40:54 +00:00
Jenkins 94cb2997e7 Merge "Install all apps from ./meta directory on devstack" 2016-09-27 03:11:24 +00:00
lvdongbing ed52b27169 Fix some typos in devstack readme
Change-Id: I7edf7272c60a9a4039e84eece7e2bff5ee62fe99
2016-09-26 21:09:26 -04:00
zhurong cac1243709 Install all apps from ./meta directory on devstack
Change-Id: I3c04c1f191b6c91a411aeccbc2faa2687d6c5d40
Partial-bug: #1624379
2016-09-26 17:07:43 +00:00
Tetiana Lashchova 2d61a0723b Remove networking config section from devstack settings
It's better to remove it because:
1. Murano supports both nova-net and neutron and it's better to
use settings from local.conf
2. Neutron is used by default [1] so this section is unnecessary even
if we want to use only neutron

[1] I185325a684372e8a2ff25eae974a9a2a2d6277e0

Change-Id: Ie1200f816faf6f262b8b235efdc6e68b6d63ced6
Closes-Bug: #1627707
2016-09-26 15:00:18 +03:00
Victor Ryzhenkin 9a2a63c0a7 Fix multiple errors in network configuration function
- Remove extra whitespace
- Get first available network only in case if ext_net_is
was not set previously

Change-Id: I998a04727e95c283b8a848d09c7df125eb53a7c0
Related-Bug: #1618999
2016-09-13 18:37:35 +04:00
Victor Ryzhenkin 1e6d619ead Use openstack-client variables in openstack CLI calls
In the change https://review.openstack.org/#/c/364885/ was
introduced fix for murano multiregion setup in case of
network determination.
We've explored that this patch may have negative impact
for multiregion installation (like freezes of the installer).

In this patch important variables were changed to openstack CLI
style and completely should fix this problem.

Change-Id: I53533864fdf0f5cc78c2b62b67261974e031fa3e
Related-Bug: #1618999
2016-09-12 20:30:16 +04:00
Victor Ryzhenkin cdd248de13 Adjust region name for network selection in devstack
- Use openstack client with region parameters to determine
external network id

Change-Id: I2ec2f395d12ea144853ddc6ed5fa4b1cba496825
Closes-Bug: #1618999
2016-09-09 11:11:29 +00:00
Kirill Zaitsev 0d1c6bdaa9 Install all dashboard/panel files from murano-dashboard
Previously murano only had _50_murano.py dashboard file. This is about
to change, to allow more granular configuration of murano and
app-catalog panels/dashboards. This commit prepares devstack to
accommodate upcoming change.
This commit also rewrites install section of murano-dashboard, to group
all copy commands under the same code block while also grouping pre/post
Newton installation instructions and removing some of the redundant code
(some of the local settings are already present in _50_murano.py in
Newton)

Targets bp: catalog-dashboard-reorg

Change-Id: I6d1d8c99aecf10567608d0c96de69a5309e706e3
2016-08-26 13:13:01 +00:00
Jenkins 19ffbab7e4 Merge "Use glare urls explicitly in devstack plugin" 2016-08-17 15:18:32 +00:00
Kirill Zaitsev 53a30e5daa Use glare urls explicitly in devstack plugin
This commit adds makes murano installed with devstack use
GLANCE_GLARE_HOSTPORT for glare endpoints instead of asking them from
keystone. This would make murano honor glance-glare urls in case they
have been set overriden by GLANCE_GLARE_HOSTPORT in local.conf

Targets bp: murano-glare-devstack-testing
Needed-By: I16be39131fafee958fa6dba2765552bc71217dfa

Change-Id: I351b1e066a21b0eb1f3f9120cd36087618c90206
2016-08-16 16:01:04 +03:00
zhurong 23fbee8dcd Add multiple api workers
There is currently no way to specify the number of api workers,
This patch add multiple api workers support.

Change-Id: Id79cb7a3e056cf5ddc9967f2f26e1973f1473e8b
Closes-Bug: #1603343
2016-08-10 13:54:36 +00:00
Nikolay Starodubtsev e689487338 Make service broker work with GLARE again.
After separation service broker from native murano on the configs/db
level GLARE support was broken. This patch updates config, devstack
script and partially service broker itself to take support back.

Change-Id: I0ea99bc491ba2ddebfc34a9c0aa681432aca7801
Closes-Bug: #1610130
2016-08-05 14:34:39 +03:00
Jenkins 7ae6018585 Merge "Use devstack for service broker use separate paste and db" 2016-07-27 17:33:37 +00:00
zhurong 3d8d5a0b0e Use devstack for service broker use separate paste and db
1.Add the devstack support for new cfapi
2.service broker use separate paste file
3.service broker use separate db

Closes-Bug: #1500777
Closes-Bug: #1500827
Change-Id: I2842828fe14878e6ff5ac194473f2ffa619370df
partial-implement: bp separate-service-broker-from-murano
2016-07-25 10:05:58 +00:00