aboutsummaryrefslogtreecommitdiff
path: root/docker/glance/glance-registry/start.sh
AgeCommit message (Collapse)AuthorFilesLines
2015-10-06Common start.shSam Yaple1-7/+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-5/+0
Change-Id: I9bb0a1fac63cc326234b0f06b1e56b43e0753279 Partially-Implements: blueprint replace-config-external
2015-09-18Replace config-external with a JSON file for Glancerthallisey1-6/+5
Change-Id: I14187db31a009c150424ea28b854a78c9ae3941d Partially-Implements: blueprint replace-config-external
2015-08-28Move docker_templates to docker dirSam Yaple1-0/+13
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-21/+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-27Change the default shell to bashChen Zhiwei1-1/+1
Unify the shell to bash in all Kolla scripts. Change-Id: Ib9591b2f8f344eb88455c5e9b7ecf2164fb5960a Implements: blueprint use-bash-shell
2015-04-01Simplify `wait_for` callsMartin André1-2/+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-1/+1
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-21Cleanup leftovers after wait_for was merged into kolla-common.shMartin André1-1/+1
Change-Id: I97ab671bfbdcf5434feedec617a938b30af4579b
2015-03-10Glance containers need to be changed so they work without kubernetesRyan Hallisey1-0/+2
This patch overlaps a little bit with https://review.openstack.org/#/c/162358/. There were some additional glance config that needs to be added to run without kubernetes. Co-authored by: Charles Crouch (charcrou@cisco.com) Change-Id: I1aab2f6e4a80aaf1e6c4b7fe330bcf9a7740fdc6
2014-12-03Cleanup variable checks in glance-registry/start.shMartin André1-2/+1
Remove redundant checks for MARIADB_SERVICE_HOST and DB_ROOT_PASSWORD that are performed in `check_for_db`, and add missing check for GLANCE_DB_USER. Change-Id: Ie8194ce76274a9356dcc0b51353873d8a632c66a
2014-10-13glance: cleanup; use kolla-common; exit on errorsLars Kellogg-Stedman1-7/+8
cause glance start.sh scripts to exit on any errors (allowing kubernetes to reschedule the pod). Change-Id: Ibebbf47758a1dfc241cb04cdb12e44af77f92b55
2014-10-13correct various issues with glance images and configsLars Kellogg-Stedman1-0/+6
- update keystone endpoints/user on boot (to avoid problems caused by, e.g., a stale password or invalid endpoint urls) - require GLANCE_DB_PASSWORD and GLANCE_KEYSTONE_PASSWORD in the environment, since we start multiple containers Change-Id: I31214b81280ed34409f92e79003c1116d5737d2e
2014-10-07fix issues with glance scriptsLars Kellogg-Stedman1-28/+1
- glance was using wrong var name for admin_password - also missing "\" in several places, breaking multi-line crudini commands. - glance was using wrong tenant name - in the registry container, glance-manage appears to reference glance-api.conf - the glance.json config file was not spawning a registry container Change-Id: I280d1db3ed576988f2bf29ea665e1922a37f8752
2014-10-07renamed keystone servicesLars Kellogg-Stedman1-1/+1
This renames the keystone services so that they are named by function, rather than port number (which would be confusing if they were running on a different port). Change-Id: Ibb0263a133c28a104563df431870a9effe584012
2014-10-07use renamed mariadb servicesLars Kellogg-Stedman1-1/+1
This patch updates all the json files that reference the mariadb service variables to ues the new names. Labelling things foo-master crept into this repository from the kubernetes guestbook example (which has redis-master and redis-slaves). We're not running clustered software at the moment so these labels are unnecessary. Change-Id: I229d04c89aa13cb6cc2e1c33a0a7b21e1c6e9caa
2014-10-03Updates to glance start scripts, db and user/role creationDan Radez1-15/+16
- adding db sync and db creation as utf8 - fixing user and role creation Partial-blueprint: kube-glance-container Change-Id: I15be99f26483e490fccc23d029f39645c13c724b
2014-09-30updating build and start scripts for glanceDan Radez1-0/+0
2014-09-18added a bunch of glance stuffLars Kellogg-Stedman1-0/+40