140 Commits

Author SHA1 Message Date
John Fulton
a048d9faa9 Default DockerCephDaemonImage to stable, not master, tag
Points overcloud_containers.yaml to the stable version of the Ceph
docker image.

Change-Id: I137ca9a005df6e95a59a4d629eb94bda6ef00d3a
Depends-On: I6acac1826271efcd4d1acf6633bde6eb8a653f44
2017-10-18 12:44:15 +00:00
Jenkins
7990b1b65c Merge "Add Mistral workbook to deploy Skydive using ansible" 2017-10-13 15:29:53 +00:00
Jenkins
ba469be286 Merge "Fix missed HEALTHCHECK directive in template override" 2017-10-10 07:28:39 +00:00
Sylvain Baubeau
a81864dab1 Add Mistral workbook to deploy Skydive using ansible
Skydive (https://github.com/skydive-project/skydive) is already
available through Kolla. This commit adds a Mistral workbook to
deploy it using ansible.

Change-Id: I0442d2a75a4931a4bd8399c58ff6b016d5486945
2017-10-04 10:22:56 +02:00
Jenkins
e21f8e094f Merge "Add OVN container images to TripleO-common" 2017-09-28 13:52:32 +00:00
Martin André
cafb1ebef1 Fix missed HEALTHCHECK directive in template override
There was one last HEALTHCHECK directive for ODL container that was
added in the interval when Ia2889d5c6a24de6e62e60deb3fa719fc437cbcb6
was first submitted and when it was merged.

Change-Id: Id2547a214a691fa862bbf6c83948ac011c021123
2017-09-26 17:33:14 +02:00
Martin André
0460c8088d Fix healthchecks permissions
Set the permissions on the files rather than recursively on the
directory otherwise symlinks are ignored.

According to the chmod man page:

"For each symbolic link listed on the command line, chmod changes the
permissions of the pointed-to  file.  In contrast, chmod ignores
symbolic links encountered during recursive directory traversals."

Closes-Bug: #1718895
Change-Id: I3c6545e0be2f70a0f7e90fbf9fda2646c36217dd
2017-09-26 17:32:26 +02:00
Jenkins
d0b55c898a Merge "Remove healthcheck command." 2017-09-26 14:39:45 +00:00
Numan Siddique
c4af83ed4f Add OVN container images to TripleO-common
Prior to this patch, OVN container images were present, but were included
even if OVN services are not enabled. Now the OVN related images are
added and the required parameters are set only if OVN services are enabled.

Change-Id: I6bc03aa65c8401a9e76954c2638006bd28a70482
Partial-bug: #1699085
2017-09-25 09:41:57 +05:30
Jenkins
979dc308e5 Merge "Add ODL repo to override template" 2017-09-22 12:07:31 +00:00
Jenkins
6b3d6b94fb Merge "Always use docker.io for ceph_namespace" 2017-09-21 17:21:10 +00:00
Jenkins
1f2be26e6c Merge "Add healthcheck for ODL container" 2017-09-21 11:35:13 +00:00
Janki Chhatbar
83eeb181f3 Add healthcheck for ODL container
This patch adds healtcheck logic for ODL container.

Change-Id: I75af8119f495e2eb1b617b9773dde7abb6ea1727
Closes-Bug: #1713632
2017-09-20 12:02:16 +05:30
Janki Chhatbar
7c3bbdffac Add ODL repo to override template
tripleo_kolla_override_template.j2 disables all external
repo. ODL is not present in Delorean repo and hence
ODL image build fails. This patch enables ODL repo in
the override template needed to built the image.

Change-Id: I27a49fa32420cb5f44ad516c5d65949a8f62cf29
Closes-Bug: #1716604
2017-09-19 15:20:31 +05:30
Giulio Fidente
90e9ef9f4c Always use docker.io for ceph_namespace
While the namespace variable does not carry the registry address,
which is defaulted to docker.io in tripleoclient, the ceph_namespace
variable needs one.

Also set the DockerCephDaemonImage value for CephClient and
CephExternal services which depend on CephBase.

Change-Id: I606158f11cb8d92876fdc4a01b7be482f471955b
Closes-Bug: #1717359
2017-09-18 15:58:50 +02:00
Janki Chhatbar
b1dc704d10 Add ODL container images to TripleO-common.
This patch implements a logic to render images based on
the neutron-driver specified.

ODL image rendering is under if-else logic because ODL is
not enabled by default in overcloud and in case when no env
file are specified, ODL image will be pulled by prepare command

Change-Id: Ia44fca9b5075de622f8390f329050a20b5bddc7a
Partial-Bug: #1713685
Depends-On: I3e395986ad777b1d6b057bb33fac8d5ed2d3d26a
2017-09-13 14:05:30 +05:30
Ian Main
f817b3c3c6 Remove healthcheck command.
We want to leave the healtchecks in place in the containers, but not
set the command.  Since we reuse the containers for different purposes
in tripleo, the healtchecks run even if the intended service is not.
eg during configuration of containers, updating etc.  This change
removes the healtcheck command, which will be added to each service in
the service templates.

Change-Id: Ia2889d5c6a24de6e62e60deb3fa719fc437cbcb6
2017-09-11 21:21:02 -04:00
Jenkins
d211189f61 Merge "Add selinux policy rpms to base container image" 2017-09-08 06:52:44 +00:00
Jenkins
7359ecf377 Merge "Define ceph image in overcloud_containers.yaml.j2" 2017-09-07 12:08:15 +00:00
Jenkins
a933c8e672 Merge "Added a kolla config file for building contaner images with qemu uid" 2017-09-07 11:24:58 +00:00
Steve Baker
020103b310 Define ceph image in overcloud_containers.yaml.j2
This change allows the ceph container image to be included in the
kolla image prepare workflow, even when coming from a different build
pipeline and source registry.

Defaults can be overridden using --set. The following achieves the
same as the defaults:

  openstack overcloud container image prepare \
    --set ceph_namespace=ceph \
    --set ceph_image=daemon \
    --set ceph_tag=tag-build-master-jewel-centos-7

Change-Id: Ib8427bfbdc44cf36ce2b71e1a9746354c96768d8
Closes-Bug: #1714225
2017-09-07 06:52:16 +00:00
Oliver Walsh
978c6485f6 Add selinux policy rpms to base container image
Required to enable selinux within containers.

Change-Id: I521c5351ad6020911106464bf712cf92e6fb0fca
Related-bug: #1715171
2017-09-05 23:26:07 +01:00
Jenkins
b727344a6a Merge "Run fluentd container" 2017-09-04 11:31:50 +00:00
Jenkins
33497b3f8e Merge "Add missing OVN container service entries" 2017-09-04 09:03:01 +00:00
Saravanan KR
fcdca87024 Added a kolla config file for building contaner images with qemu uid
Guest VMs created for DPDK will have the vhost-user socket files
created by qemu and used by openvswitch. The uid of qemu in host
is 107 where as the uid set by kolla config is 42427. Because of
this mismatch, VM creation is failing because of permission.

Setting the same uid and gid for qemu user for building kolla
images to ensure that the files are created and used with same
permission. This patch adds a config file for TripleO to be
used for building kolla images, which will have the qemu
user id values override to match the host values.

Change-Id: I9a2d6b48eb44e294a8501ac0768ea0b97abb4b5c
Partial-Bug: #1712732
2017-09-04 14:04:21 +05:30
Jenkins
d0808feb99 Merge "Add SRIOV container image parameter generation" 2017-09-01 23:18:57 +00:00
Jenkins
cc7faac9b5 Merge "Make curl healthchecks work with internal TLS" 2017-09-01 11:21:00 +00:00
Juan Badia Payno
096c61a87e Run fluentd container
Change-Id: I60796063fa9ebe0d98030fb982d22dabe2593ea0
2017-09-01 10:54:10 +02:00
Brent Eagles
4296e7d4ab Add SRIOV container image parameter generation
Add missing parameter generation for the SRIOV container.

Change-Id: I1b5ab0a64ae1f5735f1bd5a68e6ae8bdcf47ddec
2017-09-01 10:15:10 +02:00
Martin André
9e249244f4 Add missing BarbicanApi service
So that the overcloud image prepare command can add the missing entry
in images and environment files.

Change-Id: I8b20575125f028200ae47cc18b77c19c885b71cd
2017-08-31 22:17:48 +00:00
Steve Baker
6adb3f1f6b Add missing OVN container service entries
These will be required when deploying OVN and filtering image
operations by deployed services.

Change-Id: I4ae8ba9f2c5d8101b7c2f2db64d636ae8e49bc8e
Partial-Bug: #1710992
2017-08-31 11:21:28 +12:00
Martin André
0389eece17 Make curl healthchecks work with internal TLS
Implement a new get_url_from_vhost bash function that parses the given
vhost configuration file and returns the URL on which the service can
be checked.

Change-Id: I071ed26328703df9f272b689af854e3a6a1c9e97
Closes-Bug: #1713689
2017-08-30 13:19:25 +02:00
Martin André
c080439e22 Add stunnel to redis image for tls
We need to run a container in front of redis to act as the tls proxy.
Let's reuse the redis image with stunnel in it.

bp tls-via-certmonger

Change-Id: I078567c831ade540cf704f81564e2b7654c85c0b
2017-08-25 14:10:28 +02:00
Jenkins
a3bdbe9bf4 Merge "Add Qdrouterd to the overcloud containers" 2017-08-23 01:35:06 +00:00
Jenkins
1cf1c63c34 Merge "Configure mistral event engine container" 2017-08-23 01:34:59 +00:00
Jenkins
437af6b0b8 Merge "Add Barbican Config Image to overcloud containers" 2017-08-23 01:32:54 +00:00
Martin André
8f249a320b Map ContainersLogrotateCrond service to cron image
This allows to pull only the relevant images for the deployment thanks
to I7166be7f07b5be7b4ded453b6e926396fbb1aa5a.

Change-Id: I2769f52de1c4a128a921fa2e29ce32ae9c2d57e9
2017-08-22 09:33:01 +02:00
Brad P. Crochet
05998e121c Configure mistral event engine container
Add necessary configuration for Mistral Event Engine.

Change-Id: I71f556c96ed7c2bbafacab4b2f66874effbd8b73
2017-08-21 15:36:29 -04:00
Andrew Smith
07f0a01060 Add Qdrouterd to the overcloud containers
The oslo.messaging amqp 1.0 driver supports the qdrouterd for
a direct messaging backend.

This patch
* Adds qdrouterd image to the overcloud containers

Change-Id: I159d38a644a0daf96ab82cc94489a0773e50f100
2017-08-21 12:49:38 -04:00
Jenkins
77e990e586 Merge "Add NovaMetadata to nova-api image params" 2017-08-18 14:21:52 +00:00
Jenkins
cd698a80bd Merge "Use correct path in healthcheck scripts" 2017-08-18 12:11:44 +00:00
Oliver Walsh
09b357677e Add NovaMetadata to nova-api image params
Pre-requisite to splitting the nova-metadata container out of nova-api.yaml.

Change-Id: Id3407e151566d16c6ae1e1ea8c1b021dac22e727
Related-bug: #1711425
2017-08-18 01:13:40 +01:00
Steve Baker
a8139d648d overcloud_containers.yaml.j2 map images to services
This change adds a services key to each entry in
overcloud_containers.yaml.j2 which contains a list of
tripleo-heat-templates docker resource types which consume this image.

The intent is for the prepare command to use this plus the heat
environments to produce an image list that only contains images for
services actually being deployed. This targeted list will make image
upload operations quicker, which is one issue affecting containers in
CI.

Change-Id: Ie8801b11921c46923b0f7c9aaba6bf524c464e82
Partial-Bug: #1710992
2017-08-17 15:56:29 +12:00
Martin Mágr
1abff9af09 Use correct path in healthcheck scripts
Currently /usr/share/tripleo-common is used in healthcheck scripts,
but only /usr/share/openstack-tripleo-common is available in container
images

Closes-Bug: #1710629
Change-Id: Id7d169cfd34bf2a45e9bff0e389e77189cb774d7
2017-08-14 15:56:56 +02:00
Bogdan Dobrelya
7776b19a7d Add logrotate-crond container images params
Related-bug: #1700912

Change-Id: I3fd918b01edd71e3e9e7c4efe7fb790ae2f37d19
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
2017-08-14 11:23:19 +00:00
Janki Chhatbar
146094d215 Add Barbican Config Image to overcloud containers
Adds DockerBarbicanConfigImage to overcloud containers.

Change-Id: I6b5ec18ccdd51b90ff27ff7d4341260dfba71e4e
Partial-Bug: 1668924
2017-08-14 14:58:48 +05:30
Jenkins
28be53f81e Merge "Add hypen to the prefix/suffix of container name if not provided" 2017-08-13 19:46:53 +00:00
Jenkins
1ae2d6dfba Merge "Add OVN images to the overcloud containers" 2017-08-11 12:02:05 +00:00
Saravanan KR
7f79a55edc Add hypen to the prefix/suffix of container name if not provided
If suffix is provided without hypen at the start, prefix hypen
to the suffix, to support creation of image names like
openstack-nova-compute-docker, where docker is the suffix.
Also if prefix is provided without hypen at the end, add hypen
at the end of the prefix.
Closes-Bug: #1709777

Change-Id: I2330a6f35a12bf140da8b52114cb20844efc5554
2017-08-10 11:46:36 +05:30
Jenkins
3a0ad22bb7 Merge "Use nova-api image for configuration as well" 2017-08-10 00:05:29 +00:00