summaryrefslogtreecommitdiff
path: root/docker/glance
AgeCommit message (Collapse)AuthorFilesLines
2015-05-06Port to icehouseSteven Dake3-3/+3
This represents making build-docker-images --release build with the icehouse tag and causes docker-compsoe to pull from the icehouse tag. Partially-implements: blueprint port-kilo Change-Id: I66b2c39abc55c0f47152dd90e696fc46b9c58f50
2015-04-27Change the default shell to bashChen Zhiwei4-4/+4
Unify the shell to bash in all Kolla scripts. Change-Id: Ib9591b2f8f344eb88455c5e9b7ecf2164fb5960a Implements: blueprint use-bash-shell
2015-04-14remove wait_for from glance-apiSteven Dake1-2/+2
For some reason glance sometimes fails to permanently find keystone while other services do find keystone. The host also has full access to keystone. Change wait_for to fail_unless. This could be a docker bug, a wait_for bug, or some other problem. Change-Id: I02d611d65b7ffddb9c27101fd60e2a8b7cc25658
2015-04-06Remove EXPOSE options from DockerfilesSteven Dake1-2/+0
The EXPOSE options will create a local docker-proxy. This is unnecessary with --net=host mode. The docker-proxy adds about 20 microseconds of latency. Add documentation to the specification to indicate where to find the ports that are exposed by the services in case someone were to desire to add EXPOSE back to the Dockerfiles. Change-Id: I398e922fe096d6022a2d5985bb92498f89a5ea31
2015-04-01Simplify `wait_for` callsMartin André2-7/+2
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é2-2/+2
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-27Replace ; with && in DockerfileSam Yaple1-1/+1
When using ';' this can allow the previous command to fail and while the docker build proceeds without realizing a command failed. Switching to '&&' allows the exit code to make it to the docker build command and the build to fail appropriately. Change-Id: Idd0991ed4549542bb10d27da1a0a025d0503b6c1
2015-03-21Cleanup leftovers after wait_for was merged into kolla-common.shMartin André1-1/+1
Change-Id: I97ab671bfbdcf5434feedec617a938b30af4579b
2015-03-19Use keystone authentication with GlanceSteven Dake1-0/+5
Previously glance was not using keystone for authentication. This resulted in --is-public true failing when doing image-create. Co-Authored-By: Lars Stedman (larsks@redhat.com) Change-Id: I54273115242ee169201643fe0ad559392650c883
2015-03-18The wait_for function needs to be added into all the imagesRyan Hallisey1-4/+4
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-03-10Glance containers need to be changed so they work without kubernetesRyan Hallisey4-4/+32
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
2015-03-02Allow changing base imageMartin André3-3/+3
By changing the PREFIX variable in the .buildconf one is now able to build docker images from different bases. For example, add the following line to your .buildconf file to build CentOS based images: PREFIX=centos-rdo- Default base image is Fedora. For now only RH family is supported. Additionally, changing the namespace either with the NAMESPACE variable in .buildconf or via --namespace commandline option now changes the source namespace as well from the default kollaglue one. Implements: blueprint multi-baseos Co-Authored-By: Steven Dake <stdake@cisco.com> Change-Id: I3964cd2292789ea883a1f2d2738a5731a4fff49b
2015-01-19Cleanup required variables checks for all containersMartin André1-1/+3
This allows Kubernetes to reschedule containers in case a required variable is missing, for example when the Kubernetes pod is started before the service. The checks were cleaned using the following method: * remove duplicates * remove check for variables that get a default value in the same file * check for all variables used in the file * check for required services when it is obvious. Change-Id: Ib7e0530c410c61f828d36efe8925a20dc9781eab
2014-12-08Merge "Remove duplicate write of openrc"Jenkins1-8/+1
2014-12-04Remove duplicate write of openrcMartin André1-8/+1
Use KEYSTONE_PUBLIC_SERVICE_HOST in favor of KEYSTONE_PUBLIC_PORT_5000_TCP_ADDR Change-Id: Icea714e4c207a1f518faf7bda8235d4f0bc9e3f9
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-22Update MAINTAINER in Dockerfiles to Kolla ProjectLars Kellogg-Stedman3-3/+3
Remove individual MAINTAINER information from Dockerfiles. Change-Id: I777df5cde049599dc786176e1d5b4b9597f0b334
2014-10-13log to stdout/stderrLars Kellogg-Stedman1-2/+3
modify glance and keystone images to log to stdout/stderr, so that logs can be recovered using "docker logs". Change-Id: I18470c13142ceaf2f10c32e10f5e835ddaf58550
2014-10-13arrange for image storage on a volumeLars Kellogg-Stedman1-0/+2
Change-Id: I0dcbe6fd4c1d3ac9b79fc205df2013f62ff5a546
2014-10-13added simple health check scriptsLars Kellogg-Stedman3-6/+26
add /check.sh to keystone and glance-api images that can be used to verify proper functionality of the container. Change-Id: I0a878678fb8e9427d8e99af4896cbc679d3490a4
2014-10-13Merge "glance: cleanup; use kolla-common; exit on errors"Jenkins4-61/+33
2014-10-13Merge "Closes-Bug: 1379513"Jenkins1-0/+6
2014-10-13Merge "Closes-Bug: 1379442"Jenkins1-1/+1
2014-10-13glance: cleanup; use kolla-common; exit on errorsLars Kellogg-Stedman4-61/+33
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-Stedman3-19/+33
- 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-10Closes-Bug: 1379442Daneyon Hansen1-1/+1
Previously, the glance-api start script would use the container IP instead of the proxy IP for the public url when creating the keystone endpoint. This causes keystone to provide an unreachable IP within the public url and other OS services are unable to connect to the public url. Change-Id: I44befc84a90f59d535a951ee81aaff0fa1ba952d
2014-10-09Closes-Bug: 1379513Daneyon Hansen1-0/+6
Previously the glance-base script did not configure the registry host IP. This causes API to try connecting to registry on localhost. Since registry is bound to MY_IP, api is unable to connect to registry. This change adds support for the glance-base script to configure the registry_host parameter in api.conf to MY_IP. Change-Id: I1c711ff8aa95abec5ca306f03bd7e0a3883ca578
2014-10-07Reorganize k8s structureSteven Dake3-80/+0
All services go to TLD/k8s/service All pods go to TLD/k8s/pod Change-Id: Iad2977a9f0cd5f430c4e0a566846bf4681618379
2014-10-07fix issues with glance scriptsLars Kellogg-Stedman7-80/+97
- 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-Stedman2-2/+2
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-Stedman2-2/+2
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-07Validate JSONChmouel Boudjnah1-53/+57
Let's get that quickly so we can add a gate. There was some respacing along the way (used http://jsonlint.com) Change-Id: Id18b9f9757306cf3f06e6221a21a9f600db1bd2e
2014-10-04introduce a new build mechanismLars Kellogg-Stedman8-32/+3
This patch replaces the collection of individual "build" scripts with a single script (tools/build-docker-image), made available as "build" inside each image directory. The build-docker-image script will, by default, build images tagged with the current commit id in order to prevent developers from accidentally stepping on each other or on release images. Documentation in docs/image-building.md describes the script in more detail. Change-Id: I444d5c2256a85223f8750a0904cb4b07f18ab67f
2014-10-03Merge "Updates to glance start scripts, db and user/role creation - adding ↵Jenkins2-26/+26
db sync and db creation as utf8 - fixing user and role creation"
2014-10-03Updates to glance start scripts, db and user/role creationDan Radez2-26/+26
- adding db sync and db creation as utf8 - fixing user and role creation Partial-blueprint: kube-glance-container Change-Id: I15be99f26483e490fccc23d029f39645c13c724b
2014-10-03glance: remove JSON trailing commas that don't parseSteven Dake1-3/+3
Change-Id: Ie5d7f5342284997e878803b273f0796421ae6bb2
2014-09-30updating build and start scripts for glanceDan Radez11-21/+50
2014-09-25Add a push script for each of the separate daemonsSteven Dake3-0/+6
This pushes to the docker registry.
2014-09-25Make build tools build with kollaglue loginSteven Dake3-3/+3
Build with kollaglue login. Then we can upload all images under that user namespace.
2014-09-20Fix building of glance imagesSteven Dake3-3/+3
The rebuild on fedora-rdo-base broke glance building
2014-09-20Provide script to build docker imagesSteven Dake3-0/+6
Build all docker images one at a time or with one top level call
2014-09-20Base images from Fedora 20 + RDO IcehouseSteven Dake3-3/+3
Previously images were based from RHEL OSP + RDO Icehouse. This presents a problem in that internal urls are used to access the rhel7 repositories. For new contributors, we need something that can be accessed without special rhel7 permissions. mariadb and rabbitmq can from fedora cinder, glance, keystone can from fedora-rdo-base This patch also uses the RDO repositories from upstream. This patch also udpates the base fedora image with latest bits.
2014-09-18added a bunch of glance stuffLars Kellogg-Stedman8-69/+177
2014-09-18start work on glance imageLars Kellogg-Stedman3-0/+82