5703 Commits

Author SHA1 Message Date
Jenkins
ebc2e2f1c1 Merge "Change workers in murano service" 2016-11-04 12:08:14 +00:00
Jenkins
466866aaa4 Merge "Add OS_CACERT in openrc when it is configured" 2016-11-04 12:04:37 +00:00
Jenkins
8b095825dc Merge "Enable Gnocchi plugin in grafana" 2016-11-04 11:49:52 +00:00
Jenkins
343d129f3a Merge "Fix typo in ansible/roles/haproxy/templates/haproxy.cfg.j2" 2016-11-04 11:42:29 +00:00
Cady_Chen
4364ebda6a Fix typo in ansible/roles/haproxy/templates/haproxy.cfg.j2
fix ‘recomended’ to ‘recommended’

TrivialFix

Change-Id: Ica30daec68e6c66c95607ce53a48672e6ef1541d
2016-11-04 09:20:24 +00:00
Jenkins
9d138fe835 Merge "Fix Manila-data binary distro" 2016-11-04 07:44:21 +00:00
Jeffrey Zhang
dd50d68676 Add OS_CACERT in openrc when it is configured
TrivialFix

Change-Id: I5750645d63c27d3778df27ca090ceccbc08d5eef
2016-11-04 07:23:16 +00:00
Jeffrey Zhang
bbb6ad1b3f Enable Gnocchi plugin in grafana
With this plugin, we can show the gnocchi data in grafana.

TrivialFix
Change-Id: Ib93ae79f1048566626f319063f4fcaec6f151a52
2016-11-04 07:19:10 +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
Jenkins
16d772cd53 Merge "Fix keystone image building issue" 2016-11-04 07:04:17 +00:00
Jenkins
ac3ba89c8e Merge "Make Ubuntu gate work" 2016-11-04 07:01:50 +00:00
Jenkins
d0f38face0 Merge "Fix typo" 2016-11-04 06:16:05 +00:00
Jenkins
a68f0b3c91 Merge "Changed the start script name in cinder-volume" 2016-11-04 05:32:43 +00:00
Mauricio Lima
a6ccbe1803 Fix Manila-data binary distro
Closes-Bug: #1639011

Change-Id: Icc4e798590645910de1a86eaf46082343d999f6a
2016-11-04 04:51:16 +00:00
Jenkins
da832be870 Merge "Barbican: Fix race condition when starting procs simultaneously" 2016-11-03 17:31:12 +00:00
junbo
7093203d4c Fix typo
Change-Id: I683a27857b9e835e7b708c818b152dfd1e07daec
2016-11-04 01:20:19 +08:00
Jeffrey Zhang
7de2e5202b Fix keystone image building issue
wsgi.py file is remove in O. should move to keystone-wsgi-admin and
keystone-wsgi-public script.

TrivialFix

Change-Id: If86c407fd208adc5be6df54ac05dc39ee1cf757e
2016-11-03 16:56:47 +00:00
Steven Dake
4d867f1fba Make Ubuntu gate work
Co-Authored-By: Jeffrey Zhang <jeffrey.zhang@99cloud.net>
Closes-Bug: #1638895
Change-Id: Ieeb6a795a3b0295e1b8c7137c08626550317ec01
2016-11-03 16:07:47 +00:00
Pete Birley
51e6c102d1 Barbican: Fix race condition when starting procs simultaneously
This fixes a race condition when starting barbican processes,
as by default they attempt to manage the db schema on startup.

TrivialFix

Change-Id: Ic168211880709a3279511ce519756e4cbdd57fe8
2016-11-03 14:24:02 +00:00
Jenkins
dc7001de4c Merge "Add guide for Hitachi NAS Platform Driver for Manila" 2016-11-03 14:19:14 +00:00
Jenkins
703bf173ac Merge "Add missing vagrant plugin vbguest" 2016-11-03 14:15:23 +00:00
Jenkins
7a07ce0862 Merge "Use become: True when updating /etc/hosts" 2016-11-03 14:15:16 +00:00
Jenkins
a33d4fc5f5 Merge "Add warning about mixing Kolla and OpenStack releases" 2016-11-03 13:56:55 +00:00
Jenkins
87e2afa68d Merge "Remove kuryr-lib in upper-constraints.txt file when install master kuryr" 2016-11-03 13:27:16 +00:00
Jenkins
8c1e2abb64 Merge "Revert "Build source from Newton rather then Master"" 2016-11-03 13:22:56 +00:00
Jenkins
80c4d7e401 Merge "Add manila-data service" 2016-11-03 12:25:33 +00:00
Jenkins
84c5727284 Merge "Move precheck into its own role" 2016-11-03 12:22:36 +00:00
liuhongjiang
6c2d02a614 Changed the start script name in cinder-volume
In the Dockerfile of cinder-volume, the "kolla_extend_start" script
will be overwritten, and it will cause the cinder-volume container
doesn't create /var/log/kolla/cinder folder.
The name of the start script should be "kolla_cinder_extend_start" in
cinder-volume container.

Change-Id: I7251792a4fbe1442e2ffc5ebd9e41bd9cdc33568
Closes-Bug: #1638839
2016-11-03 05:53:11 -04: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
OpenStack Proposal Bot
9779778a1e Updated from global requirements
Change-Id: Ic327d1868341173ab182208cf5caedd27b937011
2016-11-02 21:54:15 +00:00
Jenkins
6548e43537 Merge "Revert "Build source from Newton rather then Master"" 2016-11-02 18:38:44 +00:00
Jenkins
723ca04703 Merge "Revert "Move RDO to Newton branches"" 2016-11-02 18:38:37 +00:00
Jenkins
bd8d65329b Merge "Set the license field in pip" 2016-11-02 18:37:46 +00:00
Jenkins
606295906e Merge "Add kuryr to precheck" 2016-11-02 14:52:20 +00:00
Jenkins
28a61bfceb Merge "Add blocks to customize RHEL package installation" 2016-11-02 13:04:20 +00:00
Jenkins
04eef90e51 Merge "Unpin ARA, update callback location" 2016-11-02 13:03:25 +00:00
Steven Dake
d323d39b66 Set the license field in pip
TrivialFix

Change-Id: I2aa6ec14f6d9da40423eabc9cd170826a65ba194
2016-11-02 04:51:13 -07:00
Steven Dake
a3737384aa Revert "Build source from Newton rather then Master"
Revert Note: Move back to master for the master branch.

This reverts commit e1ca39db92ed438991782be091efbdd91747fe8c.

Change-Id: I00758fe44b525efdc21e55ffe0f1b4d040abd63b
2016-11-02 03:30:42 -07:00
Steven Dake
e714a745c6 Revert "Move RDO to Newton branches"
Revert note: Get RDO back on master instead of the newton branch

This reverts commit aeb86de6fc644a514d060b4ac869cab364266f03.

Change-Id: I765ba60c3bd09fe3978570b7921a084c9b90c7d0
2016-11-02 03:28:15 -07:00
Paul Bourke
bc8c18f155 Add warning about mixing Kolla and OpenStack releases
Seen several instances of users having trouble attempting to mix and
match Kolla and OpenStack releases. Add warning that this is not
supported.

Change-Id: Ibdb9e584646599e49a698cfcfaf5f114b5b8943a
2016-11-02 09:49:00 +00:00
bjorn lofdahl
6ca1c68b20 Fix gnocchi deploy
Gnocchi deploy fails due to sudo -i flag

Change-Id: Id1e2af274a3aee43dfecf02f979a9584dd2cffa8
Closes-Bug: #1634148
2016-11-02 09:42:55 +01:00
zhubingbing
4255c3b644
Add kuryr to precheck
TrivialFix
Change-Id: Ia7bfa714521366818d848d924aa728819c97982a
2016-11-02 10:00:37 +08:00
Jenkins
0d5407d55e Merge "Add enable service logic in port check" 2016-11-01 17:09:31 +00:00
Jenkins
471e2c0d93 Merge "Configure log path for kibana" 2016-11-01 12:14:28 +00:00
Jenkins
668439d240 Merge "deprecate external_network_bridge option in neutron" 2016-11-01 12:13:10 +00:00
Jenkins
9f66ee7e20 Merge "change "openstack" to "OpenStack"" 2016-11-01 11:51:06 +00:00
Jenkins
fc329bcce2 Merge "Update the way of loading the admin-openrc.sh file" 2016-11-01 11:38:52 +00:00
Jenkins
23646eb07f Merge "added kibana reconfigure" 2016-11-01 11:29:08 +00:00
Jenkins
c4d34cf464 Merge "Update the format of bifrost deploy.yml" 2016-11-01 11:28:17 +00:00
prameswar
da650f868a added kibana reconfigure
Closes-bug: #1636806

Change-Id: I24e5d40ea590212114611da77cf0dfd145b76100
2016-11-01 02:15:06 +00:00