aboutsummaryrefslogtreecommitdiff
path: root/docker/base
AgeCommit message (Collapse)AuthorFilesLines
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
2015-12-24import the gpg public key properlyJeffrey Zhang1-3/+5
include: * CentOS 7 RPM GPG key * Percona repo GPG key * OpenStack Magnum repo GPG key Closes-Bug: #1528988 Change-Id: I2419d1d130c2cc4466e884e4022b64d81109943b
2015-12-24Make the yum repositories configurable in the base imageDavid Moreau Simard1-3/+3
- 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-22Merge "Use c-style string interpolation for log messages"Jenkins1-21/+18
2015-12-18Merge "Simplify logic of set_configs.py a little bit"Jenkins1-24/+9
2015-12-18Use c-style string interpolation for log messagesMartin André1-21/+18
TrivialFix Change-Id: I7ddebc7b6f71e50254801324fa2bf093fdaa8ce0
2015-12-18Merge "Create empty file by using os.mknod"Jenkins1-2/+1
2015-12-18Merge "Remove wrong comment description"Jenkins1-3/+1
2015-12-18Simplify logic of set_configs.py a little bitMartin André1-24/+9
TrivialFix Change-Id: Ic1c9fc76f4a5725ee76460c727197a96fe5d5359
2015-12-18Create empty file by using os.mknodJeffrey Zhang1-2/+1
it is more safe and pythonic. Change-Id: I728649af37cee8d1e255bb0a389cbc532e551c74
2015-12-18Remove wrong comment descriptionJeffrey Zhang1-3/+1
Base on the code logic, all the source, dest, owner and perm field is required. Change-Id: Iba5b4b2c2bd3ca0b97a3c29655e87c9701a84350