186 Commits

Author SHA1 Message Date
jiangpch
7e8c03e3c0 remove override_install_langs option in /etc/yum.conf
Closes-Bug: #1637803
Change-Id: I5c22b76379b1dce1673124ac8b46b894449405a5
2016-11-06 12:57:09 +00:00
Christian Berendt
5cd30d4914 Remove Fedora support
Closes-bug: #1616387
Change-Id: Id97f88b9baa3d48d33ce120962450a374282d044
2016-11-03 10:50:22 +01:00
Jenkins
723ca04703 Merge "Revert "Move RDO to Newton branches"" 2016-11-02 18:38:37 +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
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
Michal (inc0) Jastrzebski
70de71cc16 Fix mariadb build issue
Change-Id: I12cb9a000f2d90007c1ea55d1ca12ede28c35d6f
Closes-Bug: #1634680
2016-10-18 22:51:04 +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
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
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
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
Steven Dake
aeb86de6fc Move RDO to Newton branches
RDO Newton is available.  Lets use it and test with it this final week.

TrivialFix

Change-Id: I2a761366da7c2cf209adaceb73ac7fa9c9aa3cba
2016-10-07 03:40:10 -04:00
Jenkins
b5630840dd Merge "Fix permission for /var/log/kolla folder" 2016-09-22 09:33:06 +00:00
Jeffrey Zhang
73a39db326 Fix permission for /var/log/kolla folder
Docker will change the name volume folder permission to image already
set. /var/log/kolla is not created and well configured in image.

This patch set creates and configures proper permission /var/log/kolla
in base image.
This patch set also fixed the ceph image by adding ceph user to kolla
group.

TrivialFix

Change-Id: Ib5ef0187e90de2699b3cda31e819b4babb07e0af
2016-09-22 01:33:47 +00:00
Jenkins
ccb3ced1fb Merge "Fix base CentOS repository keys" 2016-09-21 16:44:35 +00:00
Jiri Stransky
20751763a2 Fix base CentOS repository keys
Fix typo in variable name ("yup" instead of "yum"), which means we now
import the repo keys we intended to. Furthermore we no longer try to
import EPEL key in that very spot, as it should be imported after
epel-release is installed, which already happens later during the base
image build.

CentOS/EPEL keys in the image before this patch:

()[root@6843e7e136cf ~]# rpm -q gpg-pubkey --qf '%{summary}\n' | grep -i -E '(centos)|(epel)'
gpg(CentOS-7 Key (CentOS 7 Official Signing Key) <security@centos.org>)
gpg(Fedora EPEL (7) <epel@fedoraproject.org>)

With this patch:

()[root@64a6ae7d0347 ~]# rpm -q gpg-pubkey --qf '%{summary}\n' | grep -i -E '(centos)|(epel)'
gpg(CentOS-7 Key (CentOS 7 Official Signing Key) <security@centos.org>)
gpg(CentOS Storage SIG (http://wiki.centos.org/SpecialInterestGroup/Storage) <security@centos.org>)
gpg(CentOS Virtualization SIG (http://wiki.centos.org/SpecialInterestGroup/Virtualization) <security@centos.org>)
gpg(Fedora EPEL (7) <epel@fedoraproject.org>)

Change-Id: I5cd22a887282e5de199a809b0798a439ce1a99e7
Closes-Bug: #1625585
2016-09-20 13:27:29 +02:00
Andrew Widdersheim
ccc68d78e1 Update EPEL version in base
Update to epel-release 7-6. Also, move from HTTPS to HTTP in the RHEL
builds to match what is happening in Oracle Linux. Seems as though HTTPS
does not work any longer.

TrivialFix

Change-Id: Icc457a333acdd5cc5b1e124d4308c4af1eb8d2cc
2016-09-19 18:30:38 -04:00
Jenkins
3a7cda3b82 Merge "Bump version of Kibana from 4.4 to 4.6" 2016-09-15 18:48:20 +00:00
Christian Berendt
da3156f6d5 Bump version of Kibana from 4.4 to 4.6
TrivialFix

Change-Id: Ia18cb89e0951359226add5cbd96d3a91c7fcfd8a
2016-09-15 10:11:26 +02:00
Jenkins
bb3ed4ef5b Merge "Install apt-utils in Ubuntu base image" 2016-09-13 06:15:35 +00:00
Jenkins
4d478e0bc5 Merge "Fix wrong release name in a comment in sources.list.ubuntu" 2016-09-13 06:15:21 +00:00
Christian Berendt
68601060b3 Fix wrong release name in a comment in sources.list.ubuntu
TrivialFix

Change-Id: If74270337a5d9829784ee3e28d4f994a6fd845db
2016-09-13 01:15:16 +02:00
Christian Berendt
bdb25edadf Add missing apt-get clean in Ubuntu base image
TrivialFix

Change-Id: Ibd4ba9dbe2cadb304e027b60d5b7378416719d12
2016-09-13 01:07:24 +02:00
Christian Berendt
1ab59dc8c7 Install apt-utils in Ubuntu base image
Change-Id: I5b96dc0e8debd718bb61b3bd9c1c2028af004a1c
Closes-bug: #1622777
2016-09-13 01:03:20 +02:00
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
Jenkins
a3920f6a5f Merge "Customization for base" 2016-08-30 14:49:45 +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
Eduardo Gonzalez
8e98e5f15e Change source with dot at extend_start files
Is a best practice in Unix/Linux scripts to use dots
instead of source command.
Using dots will avoid issues with non BASH shells

TrivialFix
Change-Id: Ie6480a1954f853f79faffa093452715ebd9f7d90
Signed-off-by: Eduardo Gonzalez <dabarren@gmail.com>
2016-08-29 07:29:16 +02: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
Mathias Ewald
f16a45180c External Ceph support - Implementation Glance
Most simple implementation of external ceph support.

We use INI merge to configure RBD backend for Glance and copy
ceph.conf and keyring provided by the user into the container.

Set_configs.py had to be extended to support globbing (wildcards) in
order to copy ceph keyring file which is named depending on the cephx
user name.

Partially-Implements Blueprint: external-ceph
Partially-Implements Blueprint: selectable-ceph

Change-Id: Iacadbd8ec9956e9f075206ea03b28f044cb6ffb8
2016-07-14 14:05:34 +00: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
Christian Berendt
748eef065e Remove mesos artifacts
TrivialFix

Change-Id: Ide5944ea3b47db0de4bdce6410a217b5d8991c8f
2016-06-18 17:47:30 +02: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