summaryrefslogtreecommitdiff
path: root/docker/base
AgeCommit message (Collapse)AuthorFilesLines
2016-05-16Fix build for oraclelinux basePaul Bourke1-1/+2
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-09Support a custom base imageJeffrey Zhang1-1/+1
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-03Merge "Remove unecessary blank lines"Jenkins2-3/+0
2016-05-02Remove dependencies on kazoo and friendsSteven Dake2-79/+1
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-02Remove unecessary blank linesMauricio Lima2-3/+0
TrivialFix Change-Id: I1f03d428c380dfdbde5ef33e7ea43cbf5e9154ce
2016-04-15Update base dockerfile for formattingSwapnil Kulkarni (coolsvap)1-17/+21
Change-Id: I3ff33a5f4e0359eefd997e8c0a2305d815c52486 Partial-Bug:#1569417
2016-04-14Use proper CentOS repositories for ceph and qemuSteven Dake3-39/+34
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-12Merge "Adds iscsid and tgtd docker containers"Jenkins1-0/+9
2016-04-11Identify container through PS1 shell variableCarlos Cesario2-0/+22
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-10Adds iscsid and tgtd docker containersSerguei Bezverkhi1-0/+9
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-03-19Fix 'optional' config.json valuesSamYaple1-1/+1
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-18Install Elasticsearch and Kibana packages using yum/apt-getVikram Hosakote3-0/+12
Test results of this patch set are at http://paste.openstack.org/show/490450/. Change-Id: I2957cc70fcca34706ec50a630d785f0630c3f5c0 Closes-Bug: #1553203
2016-03-15Add missing tar command for oraclelinux binaryPaul Bourke1-0/+1
Kibana was failing with the binary build type due to tar missing. TrivialFix Change-Id: Ia7cb77c5359b2ed30cd1883c0848cd1506a63833
2016-03-14Use ubuntu Mitaka repoSamYaple1-1/+1
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-13Properly pin cephSamYaple1-2/+2
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-10Merge "Add missing 'yum clean all' in oraclelinux base"Jenkins1-1/+2
2016-03-10Add missing 'yum clean all' in oraclelinux basePaul Bourke1-1/+2
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-09Add centos-extras repo to oraclelinux-basePaul Bourke2-0/+7
magnum requires python-docker-py which is missing in the oraclelinux base repos. TrivialFix Change-Id: I466a170a8df8f207c47d06ba5a6cba9b7efa3e5f
2016-03-07Fix "wait for log socket" in start.shÉric Lemoine1-1/+1
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-02Reconfigure cinder serviceJeffrey Zhang1-2/+8
Change-Id: I8d207d1782acfebf5c07de39df3257fd9bdbbada Partially-implements: bp kolla-reconfig
2016-02-27Reconfigure keystone serviceJeffrey Zhang1-3/+50
Partially-implements: bp kolla-reconfig Change-Id: Ied293e59bf4531e88a0e5e5bf9a5f5f495d2a0e7
2016-02-25Merge "Import module rather than funciton in the set_configs.py file"Jenkins1-2/+2
2016-02-25Import module rather than funciton in the set_configs.py fileJeffrey Zhang1-2/+2
TrivialFix Change-Id: I352ef1176407edf093667644ce6adbd48eb63865
2016-02-25Pin ceph-radosgwMartin André1-0/+1
Change-Id: I9ff2e9d1e682f3d6b206568863d4bac3900fc03a Closes-Bug: #1549538
2016-02-23Merge "Pin Mesos to 0.27.1 version"Jenkins2-0/+5
2016-02-23Merge "Remove Rsyslog entirely"Jenkins2-11/+1
2016-02-23Remove Rsyslog entirelyÉric Lemoine2-11/+1
Partially implements: blueprint heka Change-Id: I1322d2dc870e6f8fe052926995d993e8a08a25db
2016-02-23Pin Mesos to 0.27.1 versionMichal Rostecki2-0/+5
Change-Id: I6a3e51a4e49d896d1a8dfcc554715e2cb6a8901e Closes-Bug: 1548318
2016-02-23Skip extend_start.sh if KOLLA_SKIP_EXTEND_START is definedAngus Salkeld1-2/+4
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-19Add Heka to common roleÉric Lemoine1-0/+7
Partially implements: blueprint heka Change-Id: I9ddad09b3f16b323c7ed535243458b0de6620cdb
2016-02-19Merge "Added Elasticearch and its deployment."Jenkins3-1/+14
2016-02-16Move socket binding to named_volumeSamYaple2-1/+11
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-13Added Elasticearch and its deployment.akwasniewska3-1/+14
Part of ELK stack. Includes Dockerfiles for both Centos and Ubuntu. Change-Id: I9f76adf084cd4f68e29326112b76ffd02b5adada Partially-implements: blueprint central-logging-service
2016-02-04Merge "Move the install base type check to kolla-build"Jenkins1-22/+0
2016-02-04Move the install base type check to kolla-buildAllen Gao1-22/+0
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-03Fix some words spellingsvenkatamahesh1-1/+1
Trivial Fix Change-Id: Ic14778bb4e894490a3b6af9471ba01ab4da94601
2016-02-02Fix wrong behavior when the source is a directoryAntoine Roux1-1/+1
TrivialFix Change-Id: Ie723fb35f15be0a500b428b2b58e6b4c5321df0c
2016-01-26Add ca-certificates to required packages.akwasniewska1-0/+1
Using curl with https requires ca-certificates. TrivialFix Change-Id: Idcb78233fcc07fd3d5491e230ed78efc4f9b949f
2016-01-25Update keyserver for ubuntuSamYaple1-4/+4
Our other keyservers for ubuntu use port 80 for firewall reasons. Update the base to do the same. TrivialFix Change-Id: I4f6e59b3925e49a389e0415c943862cc13422f95
2016-01-20use http instead of https for getting mariadb keyAllen Gao2-3/+3
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-16Fix container config files directory pathWanlong Gao1-1/+1
TrivialFix Change-Id: I94dd94b1e64a6a844497e551a66e7279de636f90
2016-01-13Merge "Ceph repo has been moved to download.ceph.org"Jenkins2-5/+5
2016-01-13Ceph repo has been moved to download.ceph.orgJeffrey Zhang2-5/+5
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-11Fix missing jinja2 in source images for mesosPaul Bourke1-0/+1
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
2015-12-31Merge "Python 3 deprecated the logger.warn method in favor of warning"Jenkins1-1/+1
2015-12-31Merge "Make the logging more safe"Jenkins1-1/+2
2015-12-30Make the logging more safeJeffrey Zhang1-1/+2
TrivialFix Change-Id: I72c541c1846e503486b402e88d5b29364920fc83
2015-12-30Base and openstack-base ubuntu binary containers.Artur Zarzycki1-1/+1
Change-Id: I93d7f4227f6b4ac04e1af5afd5e46bdbaba84b4f Partially-Implements: blueprint binary-ubuntu
2015-12-29Python 3 deprecated the logger.warn method in favor of warningWanlong Gao1-1/+1
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-25Merge "import the gpg public key properly"Jenkins1-3/+5