19 Commits

Author SHA1 Message Date
Mark Goddard
f8285c336a Add netcat to binary sahara-engine image
Sahara-engine uses netcat in the neutron namespace to build a session
when use_namespaces=true, see utils/ssh_remote.py in sahara source code.

Change I8a90d33f0b7b902e059077c3b9fd32ba7b7d7df4 added netcat to the
sahara-engine image for source builds. This change does the same for
binary builds.

Change-Id: I571236d127e34da79367ec4686d7d64430a22fc8
Related-Bug: #1687624
Closes-Bug: #1687602
2017-06-07 09:48:23 +01:00
Jenkins
5841abe910 Merge "Override image's meta info." 2017-05-08 21:33:04 +00:00
Jawon Choo
31259fa595 Override image's meta info.
centos based images have wrong label info,
these changes fix own image's name and build-date.

Change-Id: I1d13f8f386c8db12b5fbe5f8ecbbf9e3fbb4ba1c
Closes-Bug: #1680341
2017-05-03 11:08:17 +09:00
junbo
66413c8046 Add netcat package in sahara-engine image
Sahara-engine use netcat in the neutron namespace to build
a session when use_namespaces=true, see utils/ssh_remote.py
in sahara source code.

Change-Id: I8a90d33f0b7b902e059077c3b9fd32ba7b7d7df4
Related-Bug: #1687624
Closes-Bug: #1687602
2017-05-02 21:33:15 +08:00
Chen
8c463a47a9 Use LABEL instead of MAINTAINER (deprecated) in all Dockerfile.j2
Use LABEL instruction instead of MAINTAINER (deprecated) instruc-
tion as suggested by Docker's official dockerfile guide.
docs.docker.com/engine/reference/builder/#maintainer-deprecated

Closes-Bug: #1683652

Change-Id: Ie87a1ddf31aefcd0b623fd2837d78de420e76898
2017-04-20 16:50:05 +09:00
Marcin Juszkiewicz
69fef5cd59 debian: enable all images enabled for Ubuntu
Debian support is not maintained in Kolla so it got a bit behind Ubuntu
one. This changeset enables Debian for all images. Jessie (even with
backports) may be too old for some images though.

Also unify distro check to ['debian', 'ubuntu'] to keep alphabetical order
like it is done for RPM distributions.

Partially-Implements: blueprint multiarch-and-arm64-containers

Change-Id: I056233fbfa277e0e2360c07c3f80d9558c554357
2017-04-04 22:48:18 +02:00
Javier Castillo Alcíbar
a614a43beb Sahara needs to run ssh-keygen
In order to generate keypair and access to cluster instances,
sahara-base container must include this binary, even when we
deploy based on source type.

Change-Id: I40747bceba3fede66864b781df1da1034ea22d11
Closes-Bug: #1665293
2017-03-10 08:22:15 +01:00
Chao Guo
961224c6cf Use install-pip macro in most source images
1. Enable customization of pip packages in source
branch of most images
2. All pip packages install uniformly through
install-pip macro, user can easily customize his
own pip command (For example using a mirror)

Co-Authored-By: Mauricio Lima <mauriciolimab@gmail.com>
Change-Id: If09582039f690fa4136e8f33200d5da15e092da7
2017-02-17 08:49:32 -03:00
Jeffrey Zhang
e5903d5fa9 Remove include_header and include_footer in all Dockerfiles
include_header and include_footer parameter is already removed, remove
them in all Dockerfiles.
Add missing footer block.

Change-Id: I90da03eb9f95a3827361d5f5ede65fde7d6be2b3
2017-02-05 10:44:48 +08:00
Sam Yaple
58eee09c15 use static uid/gid in images
This centralizes all user and group creation into a single source. This
will fix any current and furture uid/gid mismatches (such as with
nova-libvirt).

In the process, we also unify users between the distros in a standard
way. The users in the following containers change from thier defaults:

Ubuntu: _chrony user is now chrony
Ubuntu: memcache user is now memcached
All: qemu user is used for ownership and socket permissions

All uid and gid numbers are customizable via kolla-build.conf

Co-Authored-By: Kris Lindgren <klindgren@godaddy.com>
Change-Id: I120f26ab0683dc87d69727c3df8d4707e52a4543
Partially-Implements: blueprint static-uid-gid
2017-01-17 09:02:21 -03:00
zhubingbing
096ebf7465 Remove unnecessary /var/log/sahara directory
Change-Id: I3bc9e13be31d51b0aea0f73f398ebe8644a2c362
Closes-Bug: #1655355
2017-01-10 14:35:58 +00:00
Christian Berendt
5cd30d4914 Remove Fedora support
Closes-bug: #1616387
Change-Id: Id97f88b9baa3d48d33ce120962450a374282d044
2016-11-03 10:50:22 +01:00
Paul Bourke
b41247c656 Add header blocks to all Dockerfiles
Change needed to add header blocks to all Dockerfiles, similar to the
base.

Use case is to easily run something before packages are installed, e.g.
to COPY a local rpm in that can be added to the package list.

Change-Id: I1bbfdf0b762da0a392aa8bf47781315b45377bee
Closes-Bug: 1618969
2016-09-13 16:53:31 +01:00
Jenkins
e292379c0c Merge "fix sahara dockerfile" 2016-09-01 16:18:33 +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
zhubingbing
860e341034 fix sahara dockerfile
1. add sahara sudoer

2. sahara config path is error
   sahara config path is : /sahara/etc/sahara

3. sahara sync db command is error
   sync db command is: sahara-db-manage
   Reference link: http://docs.openstack.org/developer/sahara/userdoc/installation.guide.html

Change-Id: Ic4967248079bb555a2f6c0948782fc3c02d2903d
Closes-Bug: #1609860
2016-08-21 16:16:10 +00:00
Shaun Smekel
a9d08726f5 Handle empty package list for install_packages
Currently if the install_packages macro is run with an empty
package list, it will add a yum or apt-get command with no
packages listed.

This bug fix aims to omit this line when no packages have
been given, or, the operator wants to use the "_override" /
"_remove" functionality to disable all packages being
installed in a Dockerfile.

Co-Authored-By: Paul Bourke <paul.bourke@oracle.com>
Change-Id: Ifaaaebfccc3adb0f2f68a35ac08e59378bc87fdb
Closes-bug: 1612446
2016-08-19 10:49:03 +00:00
Swapnil Kulkarni (coolsvap)
3f20f257c0 Customizations for sahara
This patchset contains customization of Dockerfiles
of sahara containers

Change-Id: Ice1b71f6a58678184e9397dffb5c422da926c470
Partially-implements: blueprint third-party-plugin-support
2016-08-18 09:52:44 +00:00
Swapnil Kulkarni (coolsvap)
353d077e14 Add sahara containers
Added sahara container for
centos,ubuntu
binary,source

partially-implements blueprint sahara-container

Change-Id: Id6dad447cd6ec07286e7a6cab0b13a6d4d89c1a7
2016-05-26 16:52:07 +05:30