1113 Commits

Author SHA1 Message Date
Ryan Hallisey
6380ed84d2 Convert JSON generations from bash to python
Python script in the heat template will handle JSON generation
for the containers.

Change-Id: I296fd4a4948f3f937e3a108bc926af6415b350c4
2015-12-17 20:55:15 +00:00
Steve Baker
1733d74392 Set the name property for all deployment resources
There are two reasons the name property should always be set for deployment
resources:
- The name often shows up in logs, files and API calls, the default
  derived name is long and unhelpful
- Sorting by name determines the merge order of os-apply-config, and the
  execution order of puppet/shell scripts (note this is different to
  resource dependency order) so leaving the default name results in an
  undetermined order which could lead to unpredictable deployment of
  configs

This change simply sets the name to the resource name, but a future change
should prepend each name with a run-parts style 2 digit prefix so that the
order is explicitly stated. Documentation for extraconfig needs to clearly
state what prefix is needed to override which merge/execution order.

For existing overcloud stacks, heat currently replaces deployment resources
when the name changes, so this change
Depends-On: I95037191915ccd32b2efb72203b146897a4edbc9

Change-Id: Ic4bcd56aa65b981275c3d4214588bfc4de63b3b0
2015-12-10 14:48:04 +13:00
Ryan Hallisey
0eafa814d5 Point registry at tripleoupstream
The tripleoupstream registry contains images that are built
every time there is a change in delorean.

The gate also needs this.

Change-Id: If460853284588f637de820afa54069f773f2e6f7
2015-11-20 13:21:39 -05:00
Jenkins
99f2910211 Merge "Nova-libvirt needs to bind to /sys/fs/cgroup" 2015-11-20 17:28:57 +00:00
Jenkins
159e78db98 Merge "Add local docker registry support" 2015-11-20 17:28:48 +00:00
Jenkins
338a2bcfb3 Merge "Update docker compute environment to use json config" 2015-11-20 17:26:46 +00:00
Jenkins
ab68379056 Merge "Pin docker version for atomic at 1.8.2" 2015-11-12 15:57:14 +00:00
Ryan Hallisey
266d123286 Change the Atomic image name so it's less specific
The atomic image name in glance was being set to 'fedora-atomic'.
The glance image can be any form of atomic distro so we shouldn't
name this specifically 'fedora-atomic', but instead 'atomic-image'.

Change-Id: Ic539b82b92e3fdd834750e591d8622b7dc85fc6d
2015-11-10 13:28:30 -05:00
Ryan Hallisey
1264b1bba2 Nova-libvirt needs to bind to /sys/fs/cgroup
Nova-compute was mounting in /sys/fs/cgroup when the libvirt
container is the one that actually needs it.

Change-Id: Iae5c7ad24083a8547474611d72f015c4fd23a073
2015-11-10 18:21:22 +00:00
Jeff Peeler
317186995a Pin docker version for atomic at 1.8.2
docker-latest now points to 1.9.0, which isn't the version we're
targetting. More importantly, docker-1.9.0 doesn't work since it
complains about /etc not being able to be relabeled. Not sure how to fix
that, but we can save that battle for another time.

Change-Id: I947b7569d9cf40a409253336e51b4dec5ada36f8
2015-11-09 17:46:01 -05:00
Ryan Hallisey
092bcd9283 Add local docker registry support
Create a set of environment variables that allows us to configure
a docker registry for deployment.  This patch assumes there is a
local docker registry already setup with the images loaded in place.

Change-Id: Iaafaf23eb3fa8b24bcd8f73bb38c552bea629607
Signed-off-by: Ian Main <imain@redhat.com>
Co-Authored-By: Ryan Hallisey <rhallise@redhat.com>
2015-11-02 19:36:51 +00:00
Ryan Hallisey
3a9186d658 Update docker compute environment to use json config
In liberty, Kolla copies around files and runs the service given
a specified command, by reading a json file.

This will update the existing work to follow that template by
creating a json file for each of the services and pushing it
into the containers.

Change-Id: I5085d1896ea965fd8854765b055068a5ad30bcfd
Co-Authored-By: Jeff Peeler <jpeeler@redhat.com>
2015-11-02 19:30:37 +00:00
Dan Prince
65958395f4 Docker compute role configured via Puppet
This change adds a containerized version of the overcloud compute node for
TripleO. Configuration files are generated via OpenStack Puppet modules
which are then used to externally configure kolla containers for
each OpenStack service.

See the README-containers.md file for more information on how to set this up.

This uses AtomicOS as a base operating system and requires that we bootstrap
the image with a container which contains the required os-collect-config agent
hooks to support running puppet, shell scripts, and docker compose.

Change-Id: Ic8331f52b20a041803a9d74cdf0eb81266d4e03c
Co-Authored-By: Ian Main <imain@redhat.com>
Co-Authored-By: Ryan Hallisey <rhallise@redhat.com>
2015-10-08 07:34:26 -04:00