104 Commits

Author SHA1 Message Date
Mathias Ewald
6417595b9f Added grafana container
Added grafana repository to base image

Co-Authored-By: zhubingbing <zhubingbing10@gmail.com>

Installed grafana from repository

Change-Id: Ib99195ec4522f185f6fd4cebf10e305bb58f69c4
Partially-Implements: Blueprint performance-monitoring
2016-09-12 08:03:39 +00:00
Michal (inc0) Jastrzebski
0a50cb8889 Change ceph version to Jewel
This patch changes version of ceph from hammer to jewel. Also removed
versionlock as it seems we don't use it in ubuntu, and actually might be
risky if we miss security patch on ceph.

Change-Id: Ib8f88c2f914a4b635e59a509fa0194605eb73165
Implements: blueprint upgrade-ceph-to-jewel
2016-09-09 14:30:36 +00:00
Kevin Fox
db653891a2 add iproute package in base image.
This patch makes the ip tool available.

Kolla-Kubernetes needs it to figure out what ip addresses
are associated with the running containers as they are not
known before hand.

TrivialFix

Change-Id: I4713bb9db471463dedeb4984a55dd86e903ef65b
2016-09-01 07:36:36 -07:00
Jenkins
dd0988f074 Merge "Allow operators to override versionlock for redhat in base" 2016-08-31 17:48:08 +00:00
Jenkins
e37314aaab Merge "Use dumb-init to manage the pid 1 process" 2016-08-31 16:30:13 +00:00
Paul Bourke
19c5e97c89 Allow operators to override versionlock for redhat in base
TrivialFix

Change-Id: Iedec701e76cdf4e336abeae1286ba6359fcfeba1
2016-08-31 14:47:17 +01:00
Paul Bourke
f6e8430741 Add a block around oraclelinux base package install
Allow operators to customise the base package setup for oraclelinux in
base, similar to Ubuntu (block base_ubuntu_package_installation)

TrivialFix

Change-Id: I9c790bd4f195492dc9d666cf865a7f142cfb1abe
2016-08-31 13:38:24 +00:00
Michal (inc0) Jastrzebski
f34d0b0552 Customization for base
Customizations for base, all in same patch

Change-Id: I310a2f51ece8dfe2a159c40407b5bdb77f7ee021
Partially-implements: blueprint third-party-plugin-support
2016-08-29 19:32:57 +00:00
Jeffrey Zhang
6710bbeb7c Use dumb-init to manage the pid 1 process
Normally, when you launch a Docker container, the process you're
executing becomes PID 1, giving it the quirks and responsibilities that
come with being the init system for the container.

There are two common issues this presents:

* In most cases, signals won't be handled properly.
* Orphaned zombie processes aren't properly reaped.

the dumb-init acting like a simple init system. It launches a single
process and then proxies all received signals to a session rooted at
that child process.

Closes-Bug: #1614509
Change-Id: I9d3d04648e151ddc7c6732b92ffd3b6c9fe467ec
2016-08-20 17:27:17 +00:00
Jeffrey Zhang
04d6736e89 Pin to Ubuntu 16.04
Upgrade Ubuntu base image to Xenial

Closes-Bug: #1593599
Change-Id: I5832a729a9a4fa73c02442047c92ba088ce20db3
2016-08-20 22:30:28 +08:00
Christian Berendt
28f5722e24 Reducing disk footprint for Ubuntu/Debian images
Only install English locales and do not install documentation.

http://wiki.ubuntu.com/ReducingDiskFootprint

Change-Id: I129cd7cc8777112acb751c600feb8900c0c2a461
2016-08-05 15:52:46 +02:00
Mathias Ewald
e5ca547f37 Added telegraf container
Extended base container to include influxdb repositories

Added telegraf container with package from influxdb repo

Change-Id: I6ccf952d7b42eabe8ff7bdbd6471e395db86aa02
Partially-Implements: Blueprint performance-monitoring
2016-07-29 13:19:40 +00:00
Stephen Hindle
a7ac46750d Ensure apt-transport-https is available.
apt-transport-https needs to be installed in the base
container BEFORE we add the new sources.list

TrivialFix
Change-Id: If4a6042f02c9b6e6475c211dc02a302cb6352d7c
2016-07-22 12:09:33 -07:00
Jenkins
160d6b270d Merge "Use the disk size as the osd weight when osd_initial_weight is auto" 2016-07-05 06:14:47 +00:00
Jeffrey Zhang
d4269334dd Use the disk size as the osd weight when osd_initial_weight is auto
In most of case, the disks used by ceph have different size. Use the
default value 1 may block the ceph when one disk is full. Use the disk
size as osd weight will more reasonally.

TrivialFix

Change-Id: Ib875c7289188cbb9380355baf0c8048f1eb09332
2016-06-29 23:14:51 +08:00
Christian Berendt
727173f4be Cleanup RUN commands in base Dockerfile
This will merge several RUN statements into one RUN statement to reduce
the number of the layers of the base Docker image.

TrivialFix

Change-Id: I69b00b2e7fa7717923f0fe364c5be9b38a2dbb90
2016-06-29 13:31:07 +02:00
Michal (inc0) Jastrzebski
24b90f15ce Add customizations for apt keys and packages
To customize apt packages, you need to do something like that in
override file:

{% set base_apt_packages = base_apt_packages + ['vim', 'emacs'] %}

Change-Id: I7913ed405c2cb7e33f1cfe310d651030e0700e6b
Partially-implements: blueprint third-party-plugin-support
2016-06-21 03:14:45 +00:00
Benedikt Trefzer
190ae5957c Make container dind unpin old docker relase
- remove pinning to old docker version in ubuntu
- move docker ubuntu repository to base image

Change-Id: If05ccc0c5b3e89725acea3b603b5ef7acbbee649
Partially-implements: blueprint build-debian
2016-06-04 10:09:59 +02:00
Jenkins
ad71352a93 Merge "Use debian repos for debian base docker image" 2016-06-03 17:59:36 +00:00
Benedikt Trefzer
30c805596f Use debian repos for debian base docker image
Change-Id: Ic5c1d20fa9f7f1cd9fd20e658b4bd1abb235f3b6
Partially-implements: blueprint build-debian
2016-06-03 00:32:05 +02:00
Benedikt Trefzer
80d2edbd8e add curlrc file to base image
The curlrc file for root allows better output control for
curl downloads during build process.

Closes-Bug: #1567926

Change-Id: I19b526e4eab223d2456f4bbc2f4ba50192ec0901
2016-06-02 18:20:48 +02:00
Jeffrey Zhang
4044a3475e Pin the base distro release version
Pin the base distro release version in the master branch(Newton).
Only one distro version is supported. The supported versions are:

* CentOS: 7
* RedHat: 7
* OracleLinux: 7
* Debian: 8
* Ubuntu: 14.04

NOTE: Kolla will move to Ubuntu 16.04 in the Newton cycle

DocImpact
TrivialFix

Change-Id: I32c0edbee4de14c8a0cc7c961d566e84d70f19a4
2016-05-31 01:41:48 +00:00
Jenkins
383730443c Merge "Update ubuntu dockerfiles for formatting" 2016-05-26 11:13:10 +00:00
Swapnil Kulkarni (coolsvap)
435b21b90d Update ubuntu dockerfiles for formatting
Change-Id: If4be00b937e14ec93443dcb7249cf17099d57cbe
Closes-Bug: #1569417
2016-05-26 04:09:22 +00:00
Paul Bourke
d958e24c3d Fix build for oraclelinux base
centos-release-openstack-mitaka 1.3 is now available via the
delorean-mitaka-testing repo. We need to install this directly instead
of the 1.2 version as otherwise the subsequent 'yum update' tries to
install it and fails on the centos-release dependency which is
incompatible with the oraclelinux base.

Closes-Bug: 1576238

Change-Id: I51cb372424b27b32e95f9e81c5dddbe8e49a6131
2016-05-16 09:18:32 +00:00
Jeffrey Zhang
070bf25835 Support a custom base image
Add a new option(base-image) to support custom base image
In default, the base-image is equal to base. When using custom
image, please use command line like:

    ./tool/build.py --base-image my-image --base centos --base-tag 0.1

DocImpact

Closes-Bug: #1573544
Change-Id: If4b9c57a2b68f6f06d3e981f30b2173064e02193
2016-05-09 07:29:19 +00:00
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
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
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
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
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
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
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
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
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