106 Commits

Author SHA1 Message Date
chenxing
fa9d696440 Update the job title of checking if Murano packages exists
Closes-Bug: #1734019
Change-Id: I203db11955189971640fcf8470e7a326d591b296
2017-12-12 14:51:44 +08:00
Andrew Smith
fd1d3af0df Add support for hybrid messaging backends
This commit separates the messaging rpc and notify transports in order
to support separate and different oslo.messaging backends

This patch:
* add rpc and notify variables
* update service role conf templates
* add example to globals.yaml
* add release note

Implements: blueprint hybrid-messaging
Change-Id: I34691c2895c8563f1f322f0850ecff98d11b5185
2017-11-22 14:09:40 -05:00
Vladislav Belogrudov
71d72ed081 Murano application should contact rabbitmq by external FQDN
In case of external router internal VIP and external VIP are the
same. External router manages port/address redirection from
public network to OpenStack API. The address of the router is
set via 'kolla_external_fqdn'. Currently Murano configuration
that is handed over to Murano application instance uses
'kolla_external_vip_address'. This leads to the instance trying
to connect to internal API network. Correct address should be
'kolla_external_fqdn' which will work in both cases - either with
double VIP setup or with single VIP + external router.

Change-Id: I78c38ae0af1cecd2be2b1c6cc86bcfc51b847082
Closes-Bug: #1729611
2017-11-02 17:01:29 +03:00
James McCarthy
427373387c Import the Murano applications libary as part of setup
This applications package is useful to have in place,
import io.murano.applications along with the core package.

Change-Id: I819eebe2deae2d1ff0375a2dd39a33f50817bb83
2017-10-20 08:36:04 +01:00
Eduardo Gonzalez
56374206be Fix deployment with public TLS enabled
When deploying with tls enabled in public
endpoints, ansible modules fails due SSL certificates
are self-signed.

This change adds a new variable to allow customization
on which endpoints ansible should connect.
Defaults to admin because admin auth parameters defaults
to admin endpoint.

Change-Id: Ic3ed58cf9c9579cae08a11bbfe6fce983b5a9cbc
Closes-Bug: #1720995
2017-10-05 08:36:34 +00:00
Jenkins
9cdbae707b Merge "Simplify Openstack services configuration possibilities" 2017-09-26 15:49:22 +00:00
caoyuan
b3cb549af9 optimize the command format for murano start.yml
1. optimize the conmmand format
2. Update the "--os-auth-url", use the {{ keystone_admin_url }}
since it be defined in all.yml

Change-Id: I53278a7b1c43a021eafbd10842355a4c70c47116
2017-09-25 13:19:06 +08:00
Bertrand Lallau
a3dfdfc085 Simplify Openstack services configuration possibilities
Actually Openstack services configuration can be overriden using many
files:
- /etc/kolla/config/<< service name >>/<< config file >>
- /etc/kolla/config/<< service name >>/<<host>>/<< config file >>
- /etc/kolla/config/global.conf
- /etc/kolla/config/database.conf
- /etc/kolla/config/messaging.conf

Only per-service configuration is actually documented here:
https://github.com/openstack/kolla-ansible/blob/master/doc/advanced-configuration.rst#L164

Allowing to globally modify service configuration can be perform too,
but it can be done in 3 different manners, all not documented:
- /etc/kolla/config/global.conf
- /etc/kolla/config/database.conf
- /etc/kolla/config/messaging.conf

database.conf and messaging.conf seems redundant with global.conf.
In order to simplify codebase it seems logical to remove them.

Documentation has been added for overriding configuration globally and
release note has been added too.

Closes-Bug: #1682479
Change-Id: I5d922dfc0d938173bad34ac64e490b78db1b7e31
2017-09-13 17:47:36 +02:00
Jenkins
6ef30ca452 Merge "Add dev mode for Murano" 2017-07-20 11:27:51 +00:00
Jenkins
a71aa61ea7 Merge "Use unified vars in task" 2017-07-12 01:56:12 +00:00
Paul Bourke
77e10c72cf Add dev mode for Murano
Change-Id: I7f1bc7fe0ee2c788c3141ea5353e1348196219e1
Depends-On: Ic0431b10d723bf84eeefc72039376fe0058dd902
2017-07-10 14:48:48 +01:00
Bertrand Lallau
a9113fc466 Avoid launching "local" actions too many times
In order to speed up deployment time some "local" actions should be run
only once using 'run_once: True'.
This will decrease deployment time in case of multihost configuration.

Change-Id: I6015d772d35c15e96c52f577013b6e41197cb41a
2017-07-05 15:55:39 +02:00
caoyuan
36c530f9ed Fix the database user name for all roles
when create database user, it should use
database_user, not database_name.

Change-Id: I4dfa01d1a5a46c5c58f1fc47b0be71b186462764
Closes-Bug: #1698762
2017-06-20 21:19:31 +08:00
Jeffrey Zhang
03e1b05f99 Use unified vars in task
Ansible task support vars directive, no need implement another one in
merge_config. This patch remove the vars directive in merge_config
action plugin.

Change-Id: I33648a2b6e39b4d49ce76eb66fbf2522721f8c68
2017-06-15 22:37:28 +08:00
Paul Bourke
aff43f73e3 Add vhost to outward rabbitmq for Murano
Change-Id: I09654f29b59e0327ee1a7961e0990e4c6927e8fc
Closes-Bug: #1620374
2017-06-15 14:19:33 +01:00
Jenkins
50cbfc8b5b Merge "Mixing binary and source images for M* projects" 2017-06-06 10:12:44 +00:00
Jenkins
3a68aee3ad Merge "Use auth vars for admin user" 2017-06-04 15:05:29 +00:00
Dai Dang Van
cda878d2fb Mixing binary and source images for M* projects
In case Kolla's users want to deploy with both of
binary and source image, we should have a variable
install type that define install type for each project.

We also add specific image tag for each Openstack project.

This commit is implemented for Magnum, Manila,
Mistral and Murano projects.

Change-Id: I6aaeb74f791c79229430a52b066327de7219a9b1
Implements: blueprint mixing-binary-and-source-image
2017-06-03 15:12:49 +07:00
Bertrand Lallau
afdd11b9a2 Generalize api_interface_address variable usage
Useful api_interface_address variable has been define here:
https://github.com/openstack/kolla-ansible/blob/master/ansible/group_vars/all.yml#L57
In order to simplify codebase we must use it as much as possible.

Change-Id: I18fec19bf69e05a22a4142a9cd1165eccd022455
2017-05-23 08:35:15 +00:00
Eduardo Gonzalez
e9bde0dcb9 Use auth vars for admin user
In someplace in the code admin user, project and domain name
are hardcoded.

This change use the correct variable defined at:
https://github.com/openstack/kolla-ansible/blob/master/ansible/group_vars/all.yml#L278

Change-Id: I3a4c78d81733bf7a2f3c67d259ec5c5f5bb38d3f
2017-05-16 08:54:37 +00:00
Jeffrey Zhang
b1f015616c Add timeout parameter for precheck tasks
wait_for module waits 300 seconds for the port started or stopped.  This
is meaningless and useless in precheck. This patch change timeout to 1
seconds.

Change-Id: I9b251ec4ba17ce446655917e8ef5e152ef947298
Closes-Bug: #1688152
2017-05-04 09:02:25 +08:00
Bertrand Lallau
3170b6c2a7 Fix 'node_config_directory' variable bad usage
Some roles made a bad usage of the 'node_config_directory' variable.

As described here:
https://github.com/openstack/kolla-ansible/blob/master/ansible/group_vars/all.yml#L16

'node_config_directory' is the directory to store the config files on
the destination node.

This variable MUST be changed to 'node_custom_config'.
Futhermore this will unified all roles.

Closes-Bug: #1682445
Change-Id: Id8d8a1268c79befac8938c1e0396267314b40301
2017-04-13 17:15:24 +02:00
Paul Bourke
5418ada148 Enable sanity checks from kolla-ansible
Add a new subcommand 'check' to kolla-ansible, used to run the
smoke/sanity checks.

Add stub files to all services that don't currently have checks.

Change-Id: I9f661c5fc51fd5b9b266f23f6c524884613dee48
Partially-implements: blueprint sanity-check-container
2017-03-09 10:37:06 +00:00
Jeffrey Zhang
38ad05a872 Remove unnecessary until in register.yml file
Change-Id: I1577cc3afef4dadd3a188c8ba749c9cdfad313ae
2017-02-04 14:38:54 +08:00
Eduardo Gonzalez
4e0fa6a334 Remove hardcoded usernames in register.yml
Usernames can be configured with variables in
configuration files, but user creation is hardcoded.

Change-Id: I057cfb921d776217db66f59226dcfa79f3eb7368
Closes-Bug: #1661587
2017-02-03 12:17:54 +00:00
Jeffrey Zhang
8155d74d8d Refactor register.yml files
Co-Authored-By: Mauricio Lima <mauriciolimab@gmail.com>
Change-Id: I9a4a6b6523dee4b388513386b7d85d421f2b7b89
2017-01-26 17:10:27 +00:00
Jenkins
3f8cb8adda Merge "Refactor bootstrap.yml file" 2017-01-18 10:17:50 +00:00
Jeffrey Zhang
7233b45d29 Refactor bootstrap.yml file
Change-Id: I00d2dcb0895548ba169ab85764cf546c2214cbf5
2017-01-12 23:37:50 +08:00
caoyuan
eeac3134b3 Move murano precheck into its own role
Change-Id: I3a2b6869a7742c5bf91c3dc20523784aca0eb521
Partially-implements: blueprint condition-pre-check
2017-01-11 23:54:42 +08:00
Vladislav Belogrudov
abf4ef9eb3 Re-import Murano core library on upgrade
Change-Id: Ia3f7ed7e3ce74effb04d756ff39fb4b0328b617e
Closes-Bug: #1649606
2016-12-13 19:13:35 +03:00
Eduardo Gonzalez
775d8019b6 Add custom policies in service.json
Include custom policy.json files in service-api.json.j2 files

Change-Id: Ic55bfc6f61131aa72c3497ce8b2282056bcc7f92
Partially-Implements: blueprint custom-policies
2016-12-02 16:22:17 +00:00
Duong Ha-Quang
b5d1e4b457 Fix placement of policy.json
Currently, policy.json is put in
"{{ node_config_directory }}/{{ service_name }}"
in target nodes.

Relocation policy.json to "{{ node_config_directory }}/{{ item }}"
with item is corresponding service compoment config directory.

Currently, the policy.json is copied to all services, but it
should be reviewed and left only in neccesary service
(at many cases, only API service needs that).

Redundant files will be removed in follow up patchset.

Change-Id: I0e997dccf4ec438c9c0436db71ec2fd06650f50d
Closes-Bug: #1639686
2016-11-29 16:00:09 +07:00
Jenkins
dbc881456b Merge "Custom policy files" 2016-11-04 13:42:55 +00:00
Jeffrey Zhang
f88448e735 Change workers in murano service
* Add api_workers option in murano group.
* engine workers moved from workers to engine_workers option in engine
  group.

Change-Id: I746a4e3c69acfd809e167e14a30cc8ed6b0512fb
Closes-Bug: #1638793
2016-11-04 07:18:42 +00:00
Jeffrey Zhang
fa45801946 Move precheck into its own role
* Merge prechecks.yml and site.yml playbook
* Create empty precheck.yml into all roles.

Change-Id: I8a138558a26c0a2a66c5fd48ed37be657c99c1dd
Implements: blueprint condition-pre-check
2016-11-03 14:48:58 +08:00
Eduardo Gonzalez
ef1fd6b8c0 Custom policy files
Allow operators to use their custom policy files.
Avoid maintain policy files in kolla repos, only copying
the files when an operator add their custom config.

Implements: blueprint custom-policies
Change-Id: Icf3c961b87cbc7a1f1dd2ffbfffcf271d151d862
2016-10-28 10:47:05 +01:00
Jenkins
683305ddbf Merge "change perm 0644 to 0600 in murano role" 2016-10-19 16:00:57 +00:00
Vladislav Belogrudov
d7d8fc8069 Murano fails to deploy - cannot check core library
Murano sometimes fails to deploy due to delay in haproxy
identifying started API services. Instead of waiting for all the
services and checking existance of core library via VIP deploy
task should connect to one of the services directly for testing
service status and for package import.

Change-Id: I2934579edc910e81730dd89dbd8ff9eb11a2cc1c
Closes-Bug: #1634531
2016-10-18 18:00:45 +03:00
zhubingbing
a0d5ac7f53 Fix murano upgrade permission issue
Change-Id: I5061c572226dbb762e21cad02dccc8722ef91dc8
Partial-Bug: #1631503
2016-10-17 15:48:18 -03:00
caoyuan
92aef9c280 change perm 0644 to 0600 in murano role
TrivialFix

Change-Id: I336b86c0e4a67cfe15cbeae9c1fbae62e1474dc2
2016-10-15 17:58:14 +08:00
Jenkins
45b0f2cf63 Merge "Remove do_reconfigure.yml file for all roles" 2016-10-13 16:20:30 +00:00
Mick Thompson
ae7d9e3e1e Add register to upgrade.yml to create correct endpoint
Change-Id: I9779d5df65c5d560854dec55cc0a70cb82f895c4
Closes-Bug: #1632697
2016-10-12 14:09:26 +01:00
Jeffrey Zhang
fa856556d5 Remove do_reconfigure.yml file for all roles
do_reconfigure.yml is introduced to use serial directive. But we use
it in wrong. Now serial has moved to playbook file. So it is time to
remove the do_reconfigure.yml file

Closes-Bug: #1628152
Change-Id: I8d42d27e6bc302a0e575b0353956eaef9b2ca9fd
2016-09-27 15:04:00 +00:00
liyingjun
2d634e5eb3 Fix murano auth issue
According to installation guide from murano[1] and devstack sample config[2],
some of the configurations for keystone auth need to be changed.

[1]: http://docs.openstack.org/developer/murano/install/manual.html#install-the-api-service-and-engine
[2]: https://github.com/openstack/murano/blob/master/devstack/plugin.sh#L187-L194

Change-Id: I01f9fcf3d6eb849392c4717f8e4c78be069351a2
Closes-bug: #1624957
Closes-bug: #1621693
2016-09-20 09:05:21 +00:00
Mick Thompson
4c1482b999 Added serial option to site.yml.
Useful for upgrade etc., which is preferablly done serially.

Example usage: tools/kolla-ansible deploy OR tools/kolla-ansible upgrade

Closes-Bug: #1576708

DocImpact

Change-Id: I34b2e16f8ce53e472a4682a4738c4ac0f5abf00c
2016-09-13 09:26:51 +00:00
MD NADEEM
663cbfb063 Correct Murano keystone_authtoken option name
Change below parameters name right <-- wrong

identity_uri <-- auth_url
admin_tenant_name <-- project_name
admin_user <-- username
admin_password <-- passowrd

http://docs.openstack.org/developer/murano/install/manual.html

Change-Id: I9a687567597c3d9b0c04db98d048bfedff4f9438
Closes-Bug: #1620379
2016-09-06 11:27:22 +00:00
Jenkins
8c2bbae69e Merge "Move to transport_url for rabbitmq configuration" 2016-09-02 09:22:12 +00:00
Paul Bourke
9f5efc5ea6 Import the Murano core libary as part of setup
In order for Murano to be operational the core library package must be
imported [0]

Add Ansible tasks to do this idempotently.

[0] http://docs.openstack.org/developer/murano/install/manual.html

TrivialFix

Change-Id: I2c49e9d663595650b885267839012b543505337a
2016-08-25 16:42:09 +01:00
Jeffrey Zhang
d255743601
Move to transport_url for rabbitmq configuration
rabbit_hosts, rabbit_userid and rabbit_password are deprecated for
removal.[0]

rpc_backend is deprecated for removal.[1]

rabbit_ha_queues is deprecated. it is useless when using RabbitMQ >= 3.0
[2]

[0] https://github.com/openstack/oslo.messaging/blob/master/oslo_messaging/_drivers/impl_rabbit.py#L112,#L134
[1] https://github.com/openstack/oslo.messaging/blob/master/oslo_messaging/transport.py#L46
[2] https://github.com/openstack/oslo.messaging/blob/master/oslo_messaging/_drivers/impl_rabbit.py#L163,L174

Closes-Bug: #1614082
Change-Id: I05d318ba6c11c5dbfa9fbf67d088a43ab465be30
2016-08-25 16:07:42 +08:00
Jenkins
595fa57586 Merge "Fix murano notification driver" 2016-08-18 13:51:43 +00:00