aboutsummaryrefslogtreecommitdiff
path: root/docker/base/kolla-common.sh
AgeCommit message (Collapse)AuthorFilesLines
2015-10-06Common start.shSam Yaple1-5/+0
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-09-27remove set_configsSam Yaple1-20/+3
Change-Id: I9bb0a1fac63cc326234b0f06b1e56b43e0753279 Partially-Implements: blueprint replace-config-external
2015-08-28Move docker_templates to docker dirSam Yaple1-0/+22
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-05-15Restructure builds to allow more flexibilitySam Yaple1-170/+0
As a restructure, nothing is changed from the original behaviour and naming despite the file structure changing. The symlinks to build had to be updated generating lots of "deleted" and "new_file". The new structure is: docker/${base_distro}/${type}/${container} base_distro == centos, ubuntu, fedora, etc type == source, binary, rdo type rdo is a symlink to binary for backwards compatibility Two new flags are added to the build-all script to support the ability to support different base distros and a flag to support binary or source containers. There are several added folders that are empty to hold the directory structure for future containers of these types. To use a prefix other than centos-rdo- you can set PREFIX in the toplevel directory .buildconf file Change-Id: Ifc7bac0d827470f506c8b5c004a833da9ce13b90
2015-04-01Simplify `wait_for` callsMartin André1-1/+1
Rely on the the `check_for_*` functions and remove redundant `fail_unless_*` calls. Also change `wait_for` to exit when it is missing a required argument. Change-Id: I90c4545691d53185556e2838303ac3df0afaf9fa
2015-04-01Allow check_for_* functions to be consumed by wait_forMartin André1-21/+28
In order for the `check_for_*` functions to be consumed by `wait_for`, they should notify of their success but not exit. As a consequence, the previous behavior is restored by the fail_unless_* companion functions. With this change, it is now possible to do: wait_for 30 1 check_for_os_service_running keystone Change-Id: I16ddf8913027030c3ccb5487713d172904508fd6
2015-03-20Fix `wait_for` function in kolla-common.shMartin André1-12/+61
Add `wait_for_output` and `wait_for_output_unless` helper functions that only succeed when the command output contains the expected string, with a possibility to exit early with a failure for `wait_for_output_unless`. Change-Id: Ie20e7c72fb84f626f1a3fe9c4d2f22c9d6863dbe
2015-03-18The wait_for function needs to be added into all the imagesRyan Hallisey1-0/+35
This affects both fedora and the centos base images. Wait_for will be intregrated into kolla-common. Co-authored by: Charles Crouch <charcrou@cisco.com> Change-Id: Ide2304b787d4c3bf6fb3949f09e2cf1f450c2173
2015-02-18Support multiple different types of base OSesSteven Dake1-0/+79
Ideally we want to support Fedora and CentOS as a base operating system type. The build scripts will rewrite the Dockerfile build scripts to pull in the correct base OS. Change-Id: Ia41e21811caa3a1989c79cc42ce6615eec0c977b Partially-implements: blueprint multi-baseos