29 Commits

Author SHA1 Message Date
Surya Prakash Singh
6566ace236 Changed as per the standard convention set to use "."
When we have to source a script file use . instead of source
For Reference follow below link:
https://docs.openstack.org/contributor-guide/writing-style/code-conventions

Change-Id: Icc6a692d37e8a5bc1146d803c873505cbf6cd03f
2017-08-28 09:27:45 +00:00
Jeffrey Zhang
a8e867b6b4 Use log-file rather than logfile in gnocchi extend start script
logfile is marked as deprecated and will be removed.

Change-Id: Iacd6a0c9667a470ec0ee6b4977100cc8e0b39e27
2017-07-13 01:50:34 +08: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
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
Jeffrey Zhang
c74fb5058f Remove legacy resource types creation
Parameter --create-legacy-resource-types is removed by
Ia7d4ea3d1b9b631ac4c399ae7245e42a531f862a

Change-Id: Ic9580dee9c9c79c4f5d1968a269106067fdb73fc
2017-04-16 17:03:00 +08: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
Eduardo Gonzalez
d83e731125 Remove gnocchi-carbonara package
RDO have set carbonara package as obsoleted and is no longer used.
https://review.rdoproject.org/r/#/c/4397/

Change-Id: I5f97ee681f09e194e558eda6291e64d83766f8c1
Closes-Bug: #1676389
2017-03-27 12:13:47 +01: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
Christian Berendt
5cd30d4914 Remove Fedora support
Closes-bug: #1616387
Change-Id: Id97f88b9baa3d48d33ce120962450a374282d044
2016-11-03 10:50:22 +01:00
bjorn lofdahl
6ca1c68b20 Fix gnocchi deploy
Gnocchi deploy fails due to sudo -i flag

Change-Id: Id1e2af274a3aee43dfecf02f979a9584dd2cffa8
Closes-Bug: #1634148
2016-11-02 09:42:55 +01:00
Jeffrey Zhang
89d38770ce Fix error in Gnocchi service
* mount gnocchi volume for gnocchi-api and gnocchi-statsd
* fix the failed of gnocchi-api
* use gnocchi user when running gnocchi-upgrade
* use the app.wsgi file in python path directly, rather than copy it to
  /var/www/cgi-bin/gnocchi/app file

TrivialFix

Change-Id: Ie026b8f44cd8e9703bf115cebb4e2d50b114a3a2
2016-09-29 12:06:15 +00: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
zhubingbing
55b184a865 repair gnocchi dockerfile
1. Add the missing packages in the gnocchi image
   packages: lz4 sqlalchemy_utils gnocchiclient

2. gnocchi config path is error
   gnocchi config path is /gnocchi/etc/gnocchi

3. gnocchi sync db command is error
   sync db command is: gnocchi-upgrade
   Reference link: http://docs.openstack.org/developer/gnocchi/install.html

4. gnocchi log directory is /var/log/kolla/gnocchi

5. Add gnocchi-api running as a mod_wsgi
   Reference link: http://docs.openstack.org/developer/gnocchi/running.html

6. Add gnocchi sudoers file

Closes-Bug: #1607332

Change-Id: Id3aded82706ffd204373c97a020980d0d9b72663
2016-09-01 08:55:18 +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)
f7e18cab31 Customizations for gnocchi
This patchset contains customization of Dockerfiles
of gnocchi containers

Change-Id: I39f3cc44664225d3e7cbb735a7b70d5cd0f7ec47
Partially-implements: blueprint third-party-plugin-support
2016-07-23 05:37:02 +00:00
Swapnil Kulkarni (coolsvap)
5026e976e6 Updated Gnocchi binary containers
Added ubuntu binary containers
Added gnocchi-metricd which is new package in centos
and ubuntu

Change-Id: If21d705e8bd1e34ea894c83ae42b0c8ef20510d7
Depends-On: If4be00b937e14ec93443dcb7249cf17099d57cbe
Closes-Bug:#1582523
2016-06-01 08:31:00 +00:00
Swapnil Kulkarni (coolsvap)
9fe4d3585c Update Gnocchi dockerfiles for formatting
Change-Id: I9a3560e3ec207f5aff0a0d8e608ab481989a8d82
Partial-Bug:#1569417
2016-04-12 21:21:46 +05:30
Wanlong Gao
d1d8610d9e Remove old config-external.sh
TrivialFix

Change-Id: Ib1923d8782699904cbc6a71d2f326d9c207d0005
2016-01-15 13:36:11 +08:00
Jenkins
7f2d46278f Merge "Remove hardcoded MAINTAINER in Dockerfiles" 2015-11-23 14:12:33 +00:00
Swapnil Kulkarni (coolsvap)
59a1c8b9fb Remove hardcoded MAINTAINER in Dockerfiles
Added new option in kolla-build.conf

Change-Id: I45fe51966bcb59ea19d112281ba3d5a1ba091a56
Closes-Bug:#1514304
2015-11-23 11:03:47 +00:00
Swapnil Kulkarni (coolsvap)
17f1d9177f Drop root for gnocchi
Updates to ensure commands run in the gnocchi containers
are done as the 'gnocchi' user rather than root.

Change-Id: I2e24300e05d1b2eeaa52bdc6ed3ec4599791136e
Partially-Implements: blueprint drop-root
2015-11-23 09:04:06 +05:30
Sam Yaple
5f200e0446 Fix issue with su and bad kernels
Long story short, some kernels before 3.15 had an issue with using su
in a container when the network namespace was --net=host. The gate
has a 3.10 and a 3.13 kernel and has a problem with this. This changes
everything to use sudo

backport: liberty
Partially-Implements: blueprint functional-testing-gate
Change-Id: I4d79ccaa1cddffcc8393f64e7e1be2538efe33e5
2015-10-13 15:13:55 +00:00
Sam Yaple
94162bd08f Bring Kolla inline with FHS
This brings Kolla images inline with FHS and should make finding
locations of things more consistent and reliable with the linux world
at large.

Change-Id: Iece5b4da4bace0fb8b1f41a65ab2c852ec73e6f8
Closes-Bug: #1485742
2015-10-06 03:30:53 +00:00
Sam Yaple
cb4e875ae1 Common start.sh
The majority of the start.sh code is identical. This removes that
duplicate code while still maintaining the ability to call code in a
specific container.

The start.sh is moved into /usr/local/bin/kolla_start in the container

The extend_start.sh script is called by the kolla_start script at the
location /usr/local/bin/kolla_extend_start . It always exists because
we create a noop kolla_extend_start in the base directory. We override
it with extend_start.sh in a specific image should we need to.

Of note, the neutron-agents container is exempt from this new
structure due to it being a fat container.

Additionally, we fix the inconsistent permissions throughout. 644 for
repo files and the scripts are set to 755 via a Docker RUN command to
ensure someones local perm change won't break upstream containers.

Change-Id: I7da8d19965463ad30ee522a71183e3f092e0d6ad
Closes-Bug: #1501295
2015-10-06 03:30:26 +00:00
Jenkins
6a622ec82c Merge "Implement a install_type and install_metatype" 2015-09-28 10:49:53 +00:00
Steven Dake
0e99b69de4 Implement a install_type and install_metatype
This prepares for the RHEL OSP implementation by making the build
tool convert all binary-* into an install_type of binary and * into
an install_metatype variable substitution inside the Dockerfiles.
Further binary-* is substituted as install_name to enable proper
building only.

Change-Id: Ib681b29176eb79a3cab12ec824313fdecb6e7a5f
Partially-Implements: blueprint rhel-based-image-support
2015-09-28 03:16:48 -07:00
Sam Yaple
160f1cc011 remove set_configs
Change-Id: I9bb0a1fac63cc326234b0f06b1e56b43e0753279
Partially-Implements: blueprint replace-config-external
2015-09-27 13:44:50 +00:00
Steven Dake
6992049323 Add 'rhel' for RPM distros
Add 'rhel' to list for RPM based distros.  Also sort the distro
list for rpm packages for affected lines.

Change-Id: Ied4cb3e9763d6c6359f314d16185383ac3e006ed
Partially-Implements: blueprint rhel-based-image-support
2015-09-04 03:12:15 -07:00
Sam Yaple
cbd42ca6e9 Move docker_templates to docker dir
Updated build.py to reflect this change.
Deprecate --template option and make it a noop.

Change-Id: I7cd98d1ee684a4c64984a49597159868152683b2
Partially-Implements: blueprint remove-docker-dir
2015-08-28 13:33:50 +00:00