5970 Commits

Author SHA1 Message Date
Jenkins
7f3c9b0912 Merge "Enable senlin dashboard when enable_senlin is yes" 2016-12-06 10:08:05 +00:00
Jenkins
84780a0145 Merge "Follow Docker Inc's trademark guidelines" 2016-12-06 07:55:13 +00:00
jianyi
5cb2ec8ee9 Enable senlin dashboard when enable_senlin is yes
Depends-On: I27ac67f42ad04ac5cf6d18b6f56506949aa4887c
Change-Id: I42c8cc7a750d1fd0c4e6ca491ef13d14c968d67b
Closes-Bug: #1646023
2016-12-06 13:58:12 +08:00
Steven Dake
e64f3f5753 Follow Docker Inc's trademark guidelines
Reference:

    https://www.docker.com/trademark-guidelines

Change-Id: Id9cdc9d036339727834179162cc7dc128c11593b
Depends-On: I6cab23f190312354cb6dcc9b1741bc4edb67a98d
2016-12-05 21:54:52 -07:00
Jenkins
7b598e8ada Merge "Updated from global requirements" 2016-12-05 12:23:46 +00:00
Jenkins
8be141b0e0 Merge "Enable zaqar ui when zaqar enabled" 2016-12-05 12:12:47 +00:00
Jenkins
ab538c2cc6 Merge "Add custom policies in service.json" 2016-12-05 12:12:32 +00:00
OpenStack Proposal Bot
8cd97a5d32 Updated from global requirements
Change-Id: I5052250825a19af3b1c123b5b2c343ed08e0eaa0
2016-12-05 09:39:33 +00:00
caoyuan
9fc5157cc7 Enable zaqar ui when zaqar enabled
Depends-On:I430340b38ff7642f46d76ec621ae65dcae8157c3

Change-Id: If669601691d1505049ba4196bd3c5856091ed921
Closes-Bug: #1647164
2016-12-04 23:24:08 +08:00
Jenkins
62c6d5a379 Merge "Fix /etc/kolla permission" 2016-12-04 05:20:36 +00: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
Jenkins
58150b05ae Merge "Disable notifications for cinder when no consumer" 2016-12-02 14:58:45 +00:00
Jenkins
7fcff0e1f2 Merge "Fix barbican upgrade permission issue" 2016-12-02 13:17:18 +00:00
Jenkins
d5e3f72693 Merge "Add missing pull task for neutron-vpnaas-agent" 2016-12-02 13:17:12 +00:00
Jenkins
fe0bebc973 Merge "Enable trove dashboard when enable_trove is yes" 2016-12-02 13:15:55 +00:00
Jenkins
d749583380 Merge "Enable cloudkitty ui when enable_cloudkitty is yes" 2016-12-02 13:15:40 +00:00
Jenkins
b8434a2f53 Merge "Fix aodh role" 2016-12-02 09:22:10 +00:00
liyingjun
6671551994 Disable notifications for cinder when no consumer
Notifications for cinder is not disabled when there is no other consuming
project, it's better to disable that to reduce some pressure for the message
bus[1].

[1]:
http://docs.openstack.org/developer/oslo.messaging/FAQ.html#i-don-t-need-notifications-on-the-message-bus-how-do-i-disable-them

Change-Id: I41c16b4ef6437b0104d4f37daa8b8640db7fdd50
Closes-bug: #1642440
2016-12-02 09:22:04 +00:00
Jenkins
1c31349cbe Merge "clean up kolla related files" 2016-12-01 20:52:42 +00:00
Jenkins
df59b78f56 Merge "Remove the deprecated command and the useless "if" condition" 2016-12-01 18:25:18 +00:00
Jenkins
004940a652 Merge "Remove the "nova-network" from the ansible" 2016-12-01 18:25:04 +00:00
Paul Bourke
e50ee312af Add missing pull task for neutron-vpnaas-agent
Closes-Bug: #1646486

Change-Id: I9b4ce3d0944018113a590bbc33604408ec2d352f
2016-12-01 18:15:33 +00:00
zhubingbing
6abbdf4cb5 Enable trove dashboard when enable_trove is yes
Depends-On: I1e9295da273055bfb870c7a87a32b989f3f61e8b

Change-Id: I18733775627d7f81cca0b7aa91f006ac48f1a755
Closes-Bug: #1646337
2016-12-01 15:46:37 +00:00
zhubingbing
00ce432d99 Fix aodh role
item change to aodh

Closes-Bug: #1646522

Change-Id: Iac688cb9de230964f5efdc94f0fe774d9c0a9062
2016-12-01 15:40:08 +00:00
caoyuan
2f21d2a88d Remove the deprecated command and the useless "if" condition
TrivialFix

Change-Id: I22970a9885eda670ec17d6b8c1b368ed2e10a732
2016-12-01 15:35:07 +00:00
Jeffrey Zhang
8cada351b0 Enable cloudkitty ui when enable_cloudkitty is yes
Change-Id: If4a9e1db02e89362b01181149327983fc1c556f2
Depends-On: I6bb33de6d19ba42710e6d4138059c23076b759ec
Closes-Bug: #1641053
2016-12-01 14:50:38 +00:00
caoyuan
939f2afdcb Remove the "nova-network" from the ansible
The nova-network was deprecated, this patch to remove it
from the ansible role
TrivialFix

Change-Id: I6ea9b007a55317e36c6f5117781f9c3ed36b0012
2016-12-01 22:08:38 +08:00
Jenkins
15a917a62a Merge "Added support for a stop playbook in kolla" 2016-12-01 13:59:07 +00:00
Jeffrey Zhang
27ee3973a7 Install ansible with OpenStack requirements constrains
OpenStack requirements constrains is well tested. Use it in case of
installing upstream broken package.

This also fixes latest requests 2.12.2 break docker-py, which makes
kolla gate red.

Change-Id: I3e4ec4af2a6e1280313733e8f31f2eea7669dbc1
2016-12-01 18:50:42 +08:00
Jenkins
0d234fe910 Merge "Fix placement of policy.json" 2016-12-01 09:37:10 +00:00
Jenkins
44e11dd10b Merge "Add more options for cinder-backup." 2016-11-30 17:35:40 +00:00
Jenkins
f407f2735e Merge "Enable cinder backup tab in horizon" 2016-11-30 17:34:45 +00:00
Jenkins
c5289bb111 Merge "Ignore dom0 qemu processes during destroy" 2016-11-30 17:32:35 +00:00
Jenkins
8d3f989b84 Merge "remove /var/lib/aodh in aodo-api" 2016-11-30 15:41:20 +00:00
Jenkins
e330b87da4 Merge "Fix cloudkitty upgrade permission issue" 2016-11-30 15:28:51 +00:00
Jenkins
3f36d15bc4 Merge "Enable sahara dashboard when enable_sahara is yes" 2016-11-30 15:19:51 +00:00
zhubingbing
af3eaa5a23 Fix barbican upgrade permission issue
Change-Id: I08bfa65223fd42df218bfd9e81765d6f1a4e10c8
Closes-Bug: #1646008
2016-11-30 12:43:51 +00:00
zhubingbing
44040ae3e9 remove /var/lib/aodh in aodo-api
Change-Id: I0b0d287e575c17b81692c6e31be9a9ee11dc67fa
2016-11-30 07:52:22 +00:00
zhubingbing
50d44e3e2a Fix cloudkitty upgrade permission issue
Change-Id: I7ad42293cd2ff64b3501bfa4ee45b5d20f81139d
Closes-Bug: #1646013
2016-11-30 07:30:50 +00:00
Jeffrey Zhang
92ff63f3e0 clean up kolla related files
* rename package name from kolla to kolla-ansible
* remove docker for data_files
* remove kolla docker
* remove kolla-build console_scripts

Change-Id: I53abbf79dffb54eb785a39ba04d375bc4e4f27b0
2016-11-30 11:17:35 +08:00
Jenkins
4d713a1092 Merge "Remove fragments of docker files" 2016-11-29 17:43:15 +00:00
Jenkins
89dcde15ff Merge "Add solum ansible role" 2016-11-29 16:32:53 +00:00
Jenkins
f17731b632 Merge "Move glance precheck into its own role" 2016-11-29 16:26:16 +00:00
James McCarthy
c0a07b697e Add more options for cinder-backup.
This commit brings necessary configuration and container start-up
options to use two popular backends for backup - nfs and swift.
Both drivers support incremental backups and should work with any
cinder volume backend.

Change-Id: Ieed29a895dc1b9faad196e160a88ea9d293f9c75
2016-11-29 13:31:44 +00:00
Jenkins
c734ed4b05 Merge "Enable ironic ui when enable_ironic is yes" 2016-11-29 11:54:57 +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
8b8d10848f Merge "use uuidutils instead of uuid.uuid4()" 2016-11-29 08:40:51 +00:00
Jenkins
869febe43e Merge "Deprecate scheduler_max_attempts option in nova" 2016-11-29 07:59:56 +00:00
Jenkins
7cefb007b2 Merge "Icrease haproxy timeouts for mysql connections" 2016-11-29 07:59:03 +00:00
Jeffrey Zhang
2bdd0299b8 Enable ironic ui when enable_ironic is yes
Depends-On: Ie094b92b9a8e20696cee84698013d09306dd6e7f
Change-Id: Ib1bbf1e5cb1536a41ab8c3082026ba90811f8df7
Closes-Bug: #1645104
2016-11-29 10:06:56 +08:00