Commit Graph

3 Commits

Author SHA1 Message Date
Steve Baker
58cd1601f6 Rename contrib to container-images for packaging
A contrib directory would not be considered packagable, but we have an
increasing need to package overcloud_containers.yaml and
tripleo_kolla_template_overrides.j2 for image building and pulling in
CI and other environments.

This change renames contrib to container-images and adds symlinks in
contrib so that scripts[1] and documentation[2] that depend on this
location can be moved over to using packaged container-images rather
than git contrib.

[1] http://git.openstack.org/cgit/openstack/tripleo-quickstart-extras/tree/roles/overcloud-prep-containers/templates/overcloud-prep-containers.sh.j2#n33
    https://github.com/dprince/undercloud_containers/blob/master/build_kolla.sh#L47

[2] http://git.openstack.org/cgit/openstack/tripleo-docs/tree/doc/source/containers_deployment/tips_tricks.rst#n167
    http://git.openstack.org/cgit/openstack/tripleo-docs/tree/doc/source/containers_deployment/architecture.rst#n52
    http://git.openstack.org/cgit/openstack/tripleo-docs/tree/doc/source/containers_deployment/overcloud.rst#n58

Change-Id: Ifb736fb52e255260a4f1931b0b9b27206f2f1d82
2017-04-07 16:56:29 +12:00
Martin André
078f783f3c Remove Percona-Server-shared-56 from openstack-base image
Since Kolla commit d2c8372e99, yum is configured to fail the docker
build if a specified package is missing. This causes our image build to
fail on openstack-base because we disable external repos and yum can
not find a package for Percona-Server-shared-56. This commit blacklists
it from the openstack-base image.

Change-Id: Iba8d018b36965b49535a743fcd34428b72f3b561
2017-04-04 19:30:42 +00:00
Dan Prince
ce7a0ac53e Add TripleO template overrides file
This patch adds a template_overrides file which can be
used to build Kolla packages that work with TripleO.
The intent is to use this for tripleo-ci, and as
a default for upcoming python-tripleoclient features
to build kolla images for TripleO.

This can also be consumed by downstreams like RDO to build
TripleO containers.

Change-Id: I4d6875990e3d40c537fec1c9493261d3086c1db1
2017-02-24 11:38:53 -05:00