133 Commits

Author SHA1 Message Date
Jenkins
6fa8261a5c Merge "Remove unecessary blank lines" 2016-05-03 02:53:00 +00:00
Steven Dake
025d57f820 Remove dependencies on kazoo and friends
Since kolla-mesos has been retired, there is no need in the code
base to keep the zookeeper implementation.  As a result, just remove
it.  If we were to keep it we need virtualenvs for that part of the
code base which installs the python dependencies related to it
for from-binary installs.

This just simplifies the implementation tremendously and culls dead
code.

Change-Id: Ieda226e652d67f5b5667112f4f2556f3171366d3
Closes-Bug: #1577194
2016-05-02 06:12:50 -07:00
Mauricio Lima
2c34214388 Remove unecessary blank lines
TrivialFix

Change-Id: I1f03d428c380dfdbde5ef33e7ea43cbf5e9154ce
2016-05-02 07:44:29 -04:00
Swapnil Kulkarni (coolsvap)
53b609df45 Update base dockerfile for formatting
Change-Id: I3ff33a5f4e0359eefd997e8c0a2305d815c52486
Partial-Bug:#1569417
2016-04-15 08:53:58 +05:30
Steven Dake
e37fa65f4f Use proper CentOS repositories for ceph and qemu
CentOS has a virtualization sig and storage sig which produces
udpated ceph and qemu images.  These images are then reused within
the rest of Red Hat packaging.  Install these repositories for
CentOS and make use of them.

This should work for OracleLinux as well.
Still testing centos.

Co-Authored-By: Vikram Hosakote <vhosakot@cisco.com>
Co-Authored-By: Paul Bourke <paul.bourke@oracle.com>

Change-Id: Iea21fc4f33bbfdb973cf354d492c372bd3360acb
Closes-Bug: #1566588
2016-04-14 10:50:38 +01:00
Jenkins
544c00b497 Merge "Adds iscsid and tgtd docker containers" 2016-04-12 19:38:46 +00:00
Carlos Cesario
08b08c78b5 Identify container through PS1 shell variable
As suggested it was created the variable KOLLA_SERVICE_NAME to identify
the container service name through  PS1 shell variable.
This method it was previously discussed in IRC.
https://goo.gl/k7AdEg

The other option it was usage hostname param in kolla_docker, but
currently docker does not support it due this issue:
https://github.com/docker/compose/issues/2460

The final result is like this:

$ docker exec -it heka /bin/bash
(heka)[heka@kolla-control /]$

$ docker exec -it mariadb /bin/bash
(mariadb)[mysql@kolla-control /]$

More details can be accessed through this link
http://paste.openstack.org/show/493689/

Closes-Bug: #1557454
Change-Id: I6aab8d640a8ebb17baa9d6d4f1edd6e331674713
2016-04-11 17:50:04 -03:00
Serguei Bezverkhi
184f01a0d6 Adds iscsid and tgtd docker containers
This partially implements iscsi and lvm2 support for cinder
in Kolla. Adds iscsid and tgtd docker containers.

Change-Id: I7fb48c954e578772b90a2aa619c8bcfa990b3ae8
Partially-Implements: blueprint iscsi-lvm2-docker
2016-04-10 09:17:16 -04:00
SamYaple
f4175f04d7 Fix 'optional' config.json values
These values are optional only when the services are not enabled.

If the file does not exist we should not warn, but rather inform.

Ceph-mon is an exception here since its bootstrap process means
the files may or may not exist initially.

TrivialFix

Change-Id: Ic02bece76d480e99deecf612036f37abb5604135
2016-03-19 23:01:27 +00:00
Vikram Hosakote
ec3baf0428 Install Elasticsearch and Kibana packages using yum/apt-get
Test results of this patch set are at
http://paste.openstack.org/show/490450/.

Change-Id: I2957cc70fcca34706ec50a630d785f0630c3f5c0
Closes-Bug: #1553203
2016-03-18 04:05:30 +00:00
Paul Bourke
db27136ed5 Add missing tar command for oraclelinux binary
Kibana was failing with the binary build type due to tar missing.

TrivialFix

Change-Id: Ia7cb77c5359b2ed30cd1883c0848cd1506a63833
2016-03-15 16:16:53 +00:00
SamYaple
8b3f0d0857 Use ubuntu Mitaka repo
The rabbitmq-server package is upgraded to 3.5.7 in cloud-archive
so we update centos to match

The xen-utils package now needs an explict version, xen-utils-4.6 is
what is provided by cloud-archive mitaka

Libvirt 1.3 is in the ubuntu cloud-archive. This has a new daemon for
logging that needs further implementation in newton. For now, it has
been disabled within the qemu.conf

Co-Authored-By: Jeffrey Zhang <jeffrey.zhang@99cloud.net>
TrivialFix
Change-Id: I84217824817c484b6800a64cbd7767b127a3098e
2016-03-14 15:52:48 +00:00
SamYaple
0bb766c129 Properly pin ceph
Ubuntu is a bit different than centos. We aren't pinning a single ceph
verion because we cannot. We can however pin to a particular repo,
but we were not due to formating. This fixes that formating and pins
to a specific repo.

TrivialFix

Change-Id: I2f6c4cd2f7d51652dc2729c0ab384165151e94e2
2016-03-13 23:21:53 +00:00
Jenkins
4a5859bb46 Merge "Add missing 'yum clean all' in oraclelinux base" 2016-03-10 12:09:14 +00:00
Paul Bourke
4dd60575f2 Add missing 'yum clean all' in oraclelinux base
This one line halfs the size of oraclelinux images, from over 1GB to
just over 500MB, bringing them inline with centos.

TrivialFix

Change-Id: I9fd89aeeec56207791fc289db9880b43b17536f5
2016-03-10 10:24:19 +00:00
Paul Bourke
2967f250d7 Add centos-extras repo to oraclelinux-base
magnum requires python-docker-py which is missing in the oraclelinux
base repos.

TrivialFix

Change-Id: I466a170a8df8f207c47d06ba5a6cba9b7efa3e5f
2016-03-09 17:14:55 +00:00
Éric Lemoine
14dec25e54 Fix "wait for log socket" in start.sh
The code in docker/base/start.sh that waits for the log socket does
not work because it includes a bad "space" character after "-S".

This patch changes that character to a real "space" character. It
also sets the SKIP_LOG_SETUP envvar for the Heka container.

TrivialFix

Change-Id: I17a3005df5bbd57678350fc77030e44b5ad6acae
2016-03-07 13:21:38 +01:00
Jeffrey Zhang
e878da0412 Reconfigure cinder service
Change-Id: I8d207d1782acfebf5c07de39df3257fd9bdbbada
Partially-implements: bp kolla-reconfig
2016-03-02 23:52:49 +00:00
Jeffrey Zhang
72ac7a5541 Reconfigure keystone service
Partially-implements: bp kolla-reconfig

Change-Id: Ied293e59bf4531e88a0e5e5bf9a5f5f495d2a0e7
2016-02-27 02:15:48 +00:00
Jenkins
f1eb20d58a Merge "Import module rather than funciton in the set_configs.py file" 2016-02-25 21:53:13 +00:00
Jeffrey Zhang
2eaf65a1e1 Import module rather than funciton in the set_configs.py file
TrivialFix

Change-Id: I352ef1176407edf093667644ce6adbd48eb63865
2016-02-25 08:20:09 +08:00
Martin André
8d49c703d8 Pin ceph-radosgw
Change-Id: I9ff2e9d1e682f3d6b206568863d4bac3900fc03a
Closes-Bug: #1549538
2016-02-25 09:00:58 +09:00
Jenkins
22d32ff280 Merge "Pin Mesos to 0.27.1 version" 2016-02-23 17:34:37 +00:00
Jenkins
56c32ac39a Merge "Remove Rsyslog entirely" 2016-02-23 16:37:56 +00:00
Éric Lemoine
0417844b8d Remove Rsyslog entirely
Partially implements: blueprint heka

Change-Id: I1322d2dc870e6f8fe052926995d993e8a08a25db
2016-02-23 01:45:23 -08:00
Michal Rostecki
85398707c2 Pin Mesos to 0.27.1 version
Change-Id: I6a3e51a4e49d896d1a8dfcc554715e2cb6a8901e
Closes-Bug: 1548318
2016-02-23 09:12:50 +01:00
Angus Salkeld
2597bf8cfd Skip extend_start.sh if KOLLA_SKIP_EXTEND_START is defined
This is all kolla-mesos needs, so that we can run the extend_start
within the context of our start script. We need to do this to track
dependencies of the commands (one of which is the extend_start).

implements blueprint custom-extend-start

Change-Id: Ib844adc9c42dd8862281eb3f903d6c2b4695a34d
2016-02-23 11:09:08 +10:00
Éric Lemoine
916925c9a8 Add Heka to common role
Partially implements: blueprint heka
Change-Id: I9ddad09b3f16b323c7ed535243458b0de6620cdb
2016-02-19 20:32:00 +00:00
Jenkins
0943e12fca Merge "Added Elasticearch and its deployment." 2016-02-19 15:25:55 +00:00
SamYaple
690e6853de Move socket binding to named_volume
The extend_start.sh script for rsyslog is removed as it is no longer
needed. Docker no longer binds to /dev/log or /run/kolla/log

Closes-Bug: #1544545
Change-Id: Ic0a323a26ee4e9e15baf4598285844a8a4955f23
2016-02-16 14:42:41 +00:00
akwasniewska
792666dd79 Added Elasticearch and its deployment.
Part of ELK stack. Includes Dockerfiles for both Centos and Ubuntu.

Change-Id: I9f76adf084cd4f68e29326112b76ffd02b5adada
Partially-implements: blueprint central-logging-service
2016-02-13 07:53:24 +00:00
Jenkins
e8348d033a Merge "Move the install base type check to kolla-build" 2016-02-04 11:31:01 +00:00
Allen Gao
db53ad1ddf Move the install base type check to kolla-build
The install type is converted in kolla-build, so it will never
fail in dockerfile, move the check to kolla-build just above
the install type converting.

TrivialFix

Co-Authored-By: Jeffrey Zhang <jeffrey.zhang@99cloud.net>
Change-Id: I1500d3b47e909f94ea9f68c5245297733f63a70b
2016-02-04 16:48:12 +08:00
venkatamahesh
23b1a8c03a Fix some words spellings
Trivial Fix

Change-Id: Ic14778bb4e894490a3b6af9471ba01ab4da94601
2016-02-03 10:01:30 +00:00
Antoine Roux
b5c2bd22a2 Fix wrong behavior when the source is a directory
TrivialFix

Change-Id: Ie723fb35f15be0a500b428b2b58e6b4c5321df0c
2016-02-02 12:15:33 +00:00
akwasniewska
0de0511e3b Add ca-certificates to required packages.
Using curl with https requires ca-certificates.

TrivialFix

Change-Id: Idcb78233fcc07fd3d5491e230ed78efc4f9b949f
2016-01-26 09:29:35 +01:00
SamYaple
0ecf6ffb38 Update keyserver for ubuntu
Our other keyservers for ubuntu use port 80 for firewall reasons.
Update the base to do the same.

TrivialFix

Change-Id: I4f6e59b3925e49a389e0415c943862cc13422f95
2016-01-25 21:54:42 +00:00
Allen Gao
80dfcd0694 use http instead of https for getting mariadb key
yum.mariadb.org intermittent ssl certificate ca bundle has problem
for now.
https://mariadb.atlassian.net/browse/MDEV-9435

Change-Id: Ic0dd72c4586958224c03572ca9de0ea15a7a38fd
Closes-Bug: #1536066
2016-01-20 17:10:47 +08:00
Wanlong Gao
f2f269125d Fix container config files directory path
TrivialFix

Change-Id: I94dd94b1e64a6a844497e551a66e7279de636f90
2016-01-16 07:25:55 +08:00
Jenkins
e6bb28f1a7 Merge "Ceph repo has been moved to download.ceph.org" 2016-01-13 07:43:43 +00:00
Jeffrey Zhang
875518eb26 Ceph repo has been moved to download.ceph.org
Ceph has move it repo to download.ceph.org[0].
Actually, http://ceph.com/rpm-hammer return a http 301 code now.

[0] http://docs.ceph.com/docs/master/install/get-packages/#add-ceph

TrivalFix

Change-Id: I304f9e231c32f63e13d4a5b889412799c39f4d7e
2016-01-13 12:16:46 +08:00
Paul Bourke
494729341d Fix missing jinja2 in source images for mesos
The base image is missing python-jinja2 for source builds which causes
the kolla_mesos_start script to fail on import.

Change-Id: I8550115dd42f4401a3351cd7c466fbeb1e02a665
Closes-Bug: #1532275
2016-01-11 15:30:16 +00:00
Jenkins
91a655105f Merge "Python 3 deprecated the logger.warn method in favor of warning" 2015-12-31 07:45:06 +00:00
Jenkins
1a3e284c2b Merge "Make the logging more safe" 2015-12-31 02:16:27 +00:00
Jeffrey Zhang
991be99c89 Make the logging more safe
TrivialFix

Change-Id: I72c541c1846e503486b402e88d5b29364920fc83
2015-12-30 15:11:43 +08:00
Artur Zarzycki
918cd10bb0 Base and openstack-base ubuntu binary containers.
Change-Id: I93d7f4227f6b4ac04e1af5afd5e46bdbaba84b4f
Partially-Implements: blueprint binary-ubuntu
2015-12-30 00:11:42 +01:00
Wanlong Gao
2fde87a0e9 Python 3 deprecated the logger.warn method in favor of warning
Python 3 deprecated the logger.warn method, see:
https://docs.python.org/3/library/logging.html#logging.warning, so we
prefer to use warning to avoid DeprecationWarning.

Change-Id: Ic4e07276def17ef39764601c8a7e0991f9a4efbc
Closes-Bug: 1508442
2015-12-29 14:40:01 +08:00
Jenkins
075ae5d832 Merge "import the gpg public key properly" 2015-12-25 21:06:32 +00:00
Jeffrey Zhang
b39c8e2918 import the gpg public key properly
include:
* CentOS 7 RPM GPG key
* Percona repo GPG key
* OpenStack Magnum repo GPG key

Closes-Bug: #1528988
Change-Id: I2419d1d130c2cc4466e884e4022b64d81109943b
2015-12-24 15:54:51 +08:00
David Moreau Simard
e8ad7488f6 Make the yum repositories configurable in the base image
- Removed hardcoded yum repository configuration in favor of
  commands dynamically generated based on repo-url and repo-file
  arguments. We maintain a sane default set of repositories.
- Added generic rpm_setup_config parameter to add support for
  installing .rpm or .repo files before building containers.

Co-Authored-By: Ryan Hallisey <rhallise@redhat.com>
Implements: blueprint custom-repos
Change-Id: I1b3a7647a9e7239de3cd162cb6f464f05632bde1
2015-12-24 02:08:52 +00:00