2060 Commits

Author SHA1 Message Date
Jenkins
16d772cd53 Merge "Fix keystone image building issue" 2016-11-04 07:04:17 +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
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
Jenkins
87e2afa68d Merge "Remove kuryr-lib in upper-constraints.txt file when install master kuryr" 2016-11-03 13:27:16 +00:00
Jenkins
80c4d7e401 Merge "Add manila-data service" 2016-11-03 12:25:33 +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
Jenkins
723ca04703 Merge "Revert "Move RDO to Newton branches"" 2016-11-02 18:38:37 +00:00
Jenkins
28a61bfceb Merge "Add blocks to customize RHEL package installation" 2016-11-02 13:04:20 +00: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
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
Jenkins
471e2c0d93 Merge "Configure log path for kibana" 2016-11-01 12:14:28 +00:00
Mauricio Lima
d62552463f Add manila-data service
Change-Id: Ie82f1dd7773ef2cc2c6724ec0b5f78ebd79566ee
Closes-Bug: #1635370
2016-10-27 11:47:04 -03:00
Jeffrey Zhang
a5afa45f4e Configure log path for kibana
Closes-Bug: #1635989
Change-Id: I99402e54e7cc2f1ad972021bb1056966f5c08bff
2016-10-24 12:12:58 +00:00
Jenkins
f209dee147 Merge "Install the packages needed by different ironic drivers" 2016-10-24 11:21:33 +00:00
Jeffrey Zhang
1c6eae70ef Remove kuryr-lib in upper-constraints.txt file when install master kuryr
kuryr add itself to upper-constrains.txt file with kuryr-lib===0.1.0 .
then installing master kuryr which is > 0.1.0 with constraints will
raises an error.  There is nothing we can do unless removing the
kuryr-lib line in upper-constrains.txt file.

TrivialFix

Change-Id: Iec7d8a3bc9e00b2d08665329e2f3c2c5ccc43818
2016-10-24 16:11:19 +08:00
caoyuan
5c6cddbcf6 Remove the unnecessary "if" condition
TrivialFix

Change-Id: Ib7f07b88055594e594604ed2c4471058719cba56
2016-10-22 00:20:18 +08:00
Jeffrey Zhang
7786f393d6 Install the packages needed by different ironic drivers
Change-Id: If3f30f58eae31753d34e94d030d1f37d9a1e6c47
Closes-Bug: #1635128
2016-10-20 14:40:26 +08:00
Jeffrey Zhang
3e89f987c0 Add validate no new line at end of file
TrivialFix

Change-Id: I817aa52caf56b7d54b266e553db6db1ceb38b773
Signed-off-by: Jeffrey Zhang <zhang.lei.fly@gmail.com>
2016-10-19 17:17:06 +00:00
Andrew Widdersheim
8260bfb348 Add blocks to customize RHEL package installation
Add blocks to the base Docker image that allows the operator to override
the base RHEL package installation.

TrivialFix
Change-Id: If570975e1f57ef9820544174dacc3f13d09bb215
2016-10-19 11:30:05 -04:00
Jenkins
65b8b17e8d Merge "Support Searchlight Docker container" 2016-10-19 15:22:44 +00:00
liyingjun
1fe4513623 Support Searchlight Docker container
This patch adds Searchlight Dockerfile to build container from source.

Change-Id: Ia28f54ddd9793699153e254b6379f3b6334482b0
Partial-implements: bp support-searchlight-deployment
2016-10-19 00:49:46 +00:00
Michal (inc0) Jastrzebski
70de71cc16 Fix mariadb build issue
Change-Id: I12cb9a000f2d90007c1ea55d1ca12ede28c35d6f
Closes-Bug: #1634680
2016-10-18 22:51:04 +00:00
Serguei Bezverkhi
46b41d2fad Adding kubetoolbox image
This PS adds kubetoolbox image which is required for Kubernetes
fencing pod. This image includes, kubectl binary, ceph-common and ipmi.

Change-Id: I17b2a47b95ed7dea391f1427a41c92b15c97986d
Partially-Implements: blueprint kubernetes-toolbox
2016-10-18 14:03:44 -04:00
Jenkins
15e686dc9f Merge "Adds Fluentd docker image required for kolla-kube" 2016-10-18 13:22:30 +00:00
Jenkins
53bc43b20b Merge "move sys.exit out of try finally block in set_config.py file" 2016-10-17 20:53:03 +00:00
Jenkins
982f6ff442 Merge "Merge run commands in elasticsearch container" 2016-10-17 18:35:52 +00:00
Jenkins
ac458c8ccc Merge "Fix log directory of Elasticsearch" 2016-10-17 18:35:48 +00:00
Jenkins
51f46035e7 Merge "Remove ceph repo for Ubuntu install" 2016-10-17 16:20:58 +00:00
Christian Berendt
4223fdfbeb Fix log directory of Elasticsearch
Logs should be stored in /var/log/kolla/elasticsearch.

Change-Id: If3ba4ec6ce2dbe9859ca604f0ee2df7fc4d15bd9
Closes-bug: #1634046
2016-10-17 11:34:31 +02:00
Christian Berendt
5668427b4b Merge run commands in elasticsearch container
TrivialFix

Change-Id: Ie7d090ad4665a3549a8072eed30ab1b820354c83
2016-10-17 10:54:47 +02:00
Jeffrey Zhang
060b2053b8 Remove ceph repo for Ubuntu install
Ubuntu cloud archive provides ceph jewel now. Remove ceph official repo
for the wrong dependency when installing ceph.

Change-Id: I5be6b18c4250733ed9ab4f526fcdc45eb84f8342
Closes-Bug: #1633888
2016-10-16 16:28:48 +00:00
Jenkins
77e2dfbd73 Merge "change source to . in gnocchi-base dockerfile" 2016-10-16 01:24:56 +00:00
Jenkins
57203424c2 Merge "ansible: swift: Fix swift-object-expirer restart loop" 2016-10-14 18:08:12 +00:00
Jeffrey Zhang
d1676d38e4 move sys.exit out of try finally block in set_config.py file
when code exit by using sys.exit in try..catch block, it will skip catch
and run the code in finally. Because SystemExit does not inherit from
Exception.

This patch moves sys.exit out of finally block. Then it won't execute
when script exits by sys.exit

Change-Id: I6457b1b861d2f9fdadce788ac6b719f46c7f2af3
Partial-Bug: #1631503
2016-10-14 16:44:54 +08:00
Jenkins
a683486a07 Merge "Remove unneeded blank lines" 2016-10-14 08:28:14 +00:00
Jenkins
9b2756bfd0 Merge "copy ldlinux.c32 to /tftpboot in ironic_pxe" 2016-10-13 15:31:11 +00:00
Jenkins
db9003e39b Merge "Fix keystone fernet file exchange via ssh" 2016-10-13 13:50:46 +00:00
Jenkins
8ad1ca0fb1 Merge "Fix rabbitmq upgrade permission issue" 2016-10-13 13:50:39 +00:00
Jenkins
b5773e6465 Merge "Change keystone.log's permit to keystone:keystone" 2016-10-13 11:08:56 +00:00
Waldemar Znoinski
3d996aeb8c copy ldlinux.c32 to /tftpboot in ironic_pxe
Change-Id: Ie42f75d0779b8e2bd835e9cdc165e73751ce5172
Closes-bug: #1632840
2016-10-12 20:21:52 +00:00
Serguei Bezverkhi
749679448a Adds Fluentd docker image required for kolla-kube
This PS adds Fluentd docker image to Kolla. Kolla
currently does not use Fluentd for log collection, but this image
is required for Kubernetes centralized logging solution.

Change-Id: I719661d75f5044239a1fd52080d322c77490ecae
Partially_Implements: blueprint kubernetes-images
2016-10-12 13:32:23 -04:00
Jeffrey Zhang
4c207bc039 Fix rabbitmq upgrade permission issue
During the upgrade from Mitaka to Newton, the uid/gid may change for the
same image. Especially on Ubuntu, we moved to Ubuntu Xenial in Newton
and it added systemd related user which break all the uid/gid during an
upgrade. It will the permissions in all docker named volumes.

This fix extends set_config.py to set the proper permission during
container start. This is super light then add commands in
extend_start.sh file  or add ansible tasks.

This patch just fixes rabbitmq case. Other services will be fixed in
following patches.

Partial-Bug: #1631503
Change-Id: Ib17027b97abbc9bf4e3cd503601b8010325b5c5b
2016-10-13 01:19:05 +08:00
Christian Berendt
bedca5b35e Fix keystone fernet file exchange via ssh
* install openssh client in keystone-fernet container
* install rsync in keystone-ssh container
* fix syntax issue in ssh configuration
* copy ssh configuration into keystone-fernet container
* copy id_rsa.pub into keystone-ssh container
* copy id_rsa into keystone-fernet container
* use full path to ssh binary in used scripts
* add missing newlines at EOF
* when using type source set /var/lib/keystone as home
  directory for the user keystone

Co-Authored-By: Jeffrey Zhang <jeffrey.zhang@99cloud.net>
Change-Id: Id6b41030056a69f6516a054beb2fc0e08226e876
Closes-bug: #1623013
2016-10-12 16:29:34 +00:00
Jenkins
22f197cdb3 Merge "Fix the failure to launch instance when enabled Ceph" 2016-10-12 10:22:46 +00:00
zhubingbing
4817cd730c change source to . in gnocchi-base dockerfile
TrivialFix

Change-Id: I6b2d9331f5f28999f0d6cd037357883fdf0770a3
2016-10-12 07:56:41 +00:00
Otavio Salvador
9eb38405b7 ansible: swift: Fix swift-object-expirer restart loop
The swift-object-expirer is provided by the 'openstack-swift-proxy'
package and thus it is unavailable on swift-object image. This change
adds a new Docker image to fulfill this requirement and stop using
swift-object image in this case.

This image is needed while RDO does not fix the packaging. The issue
is being tracked in:

  https://bugzilla.redhat.com/show_bug.cgi?id=1382921

Change-Id: Idc7ee92d756d8923da2198ede33abf5ed1142041
Closes-Bug: 1630425
2016-10-11 14:56:18 -03:00
Jeffrey Zhang
255198e742 Fix the failure to launch instance when enabled Ceph
We need install qemu-kvm package which come from the Cloud SIG rather
then qemu-system-x86 which come from EPEL.

Change-Id: Ibd027069771552d3db0e4fe0c7406ddd1bfc0673
Closes-Bug: #1631984
2016-10-12 01:31:09 +08:00
Jenkins
bd1edb46f1 Merge "Add missing uwsgi for barbican-api Dockerfile" 2016-10-11 10:53:13 +00:00