summaryrefslogtreecommitdiff
path: root/docker/glance
AgeCommit message (Collapse)AuthorFilesLines
2015-10-15Merge "Use openstack/requirements for glance"Jenkins1-1/+1
2015-10-15Use openstack/requirements for glancePaul Bourke1-1/+1
See Iccb4e99f8e4b6659a19c1817d0f4c697824af25c for context. Change-Id: I46f456ce71f76b0a6a2933220a500c5221769ff9 Partial-Bug: #150530
2015-10-14Merge "Make Ceph work for RPM based distributions"Jenkins1-2/+13
2015-10-13Make Ceph work for RPM based distributionsSteven Dake1-2/+13
Ceph packages need to be installed in nova, glance, and cinder. Once that is done, Ceph works like a champ! Change-Id: I296da1d04d0c1bcb729f22e65e432d53d561b49c backport: liberty Closes-Bug: #1505549
2015-10-13Fix issue with su and bad kernelsSam Yaple1-1/+1
Long story short, some kernels before 3.15 had an issue with using su in a container when the network namespace was --net=host. The gate has a 3.10 and a 3.13 kernel and has a problem with this. This changes everything to use sudo backport: liberty Partially-Implements: blueprint functional-testing-gate Change-Id: I4d79ccaa1cddffcc8393f64e7e1be2538efe33e5
2015-10-06Common start.shSam Yaple4-20/+2
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-28Merge "Implement a install_type and install_metatype"Jenkins3-3/+3
2015-09-28Merge "remove set_configs"Jenkins2-10/+0
2015-09-28Implement a install_type and install_metatypeSteven Dake3-3/+3
This prepares for the RHEL OSP implementation by making the build tool convert all binary-* into an install_type of binary and * into an install_metatype variable substitution inside the Dockerfiles. Further binary-* is substituted as install_name to enable proper building only. Change-Id: Ib681b29176eb79a3cab12ec824313fdecb6e7a5f Partially-Implements: blueprint rhel-based-image-support
2015-09-27remove set_configsSam Yaple2-10/+0
Change-Id: I9bb0a1fac63cc326234b0f06b1e56b43e0753279 Partially-Implements: blueprint replace-config-external
2015-09-27Remove all fail sections for UbuntuSam Yaple1-6/+0
Ubuntu binary is not supported and may never be. Installing from cloud-archive packaging is only for the current stable distros, Ubuntu does not have a Delorean type repo. We place a fail message in the base image to catch this and remove the messages throughout the project. An additional fail message is placed to catch all other things. Change-Id: Id2953f503ebd42226f6a08e75979ae56511c40f7 Implements: blueprint install-from-ubuntu
2015-09-25Make OpenStack use CephSam Yaple1-0/+9
This implements all the openstack pieces needed to make ceph work. DocImpact Change-Id: I1d24476a966602cf955e5ef872b0efb01319894a Partially-Implements: blueprint ceph-container Implements: blueprint kolla-live-migration
2015-09-25Fix removal of config-externalSam Yaple2-2/+0
I removed the files but not the COPY commands thus breaking all of Kolla Change-Id: I37d3e0cb94a1ecc12971f485f953310ba8fee53c Partially-Implements: blueprint replace-config-external
2015-09-25Remove config-external.shSam Yaple2-20/+0
Removes config-external for all services that have been replaced in Ansible Change-Id: I839a14418638b977fbc1d02ba6839811b0f909ea Partially-Implements: blueprint replace-config-external
2015-09-18Replace config-external with a JSON file for Glancerthallisey2-12/+10
Change-Id: I14187db31a009c150424ea28b854a78c9ae3941d Partially-Implements: blueprint replace-config-external
2015-09-05Import not found for glanceSteven Dake1-0/+2
Glance now depends on python-castellan and python-cryptography but the package is not in the package depends list. Change-Id: I8ba8c191572b0c7f51df5948a2951d9a7e0aead4 Closes-Bug: #1492641
2015-09-04Add 'rhel' for RPM distrosSteven Dake1-1/+2
Add 'rhel' to list for RPM based distros. Also sort the distro list for rpm packages for affected lines. Change-Id: Ied4cb3e9763d6c6359f314d16185383ac3e006ed Partially-Implements: blueprint rhel-based-image-support
2015-09-04Merge "Allow arbitrary source archive name to be imported into Dockerfile"Jenkins1-2/+2
2015-09-03Allow arbitrary source archive name to be imported into DockerfileVladislav Belogrudov1-2/+2
Currently we cannot import source archives with names different than expected by hardcoded line in Dockerfiles. This worked well for Openstack services' tarballs where we expected SERVICE-* root folder after extraction or kanaka-noVNC for nova-novncproxy docker. The latter fails if one tries to clone or get tarball under other names. This fix allows any archive (tar,tgz,zip) or repo name to be imported into dockerfile. Change-Id: I869a6a19afaf0e93925572746c22b7589b6600c9 Closes-Bug: #1491415
2015-09-03Create openstack-base containerSam Yaple1-1/+1
This creates and moves the dependencies for Ubuntu into a common openstack-base container. This commit shows dramatically smaller sizes for all non-openstack containers. The Openstack container remain the same size. Change-Id: I2f46420d4b9edcfddda374caddcce906fc708f6c Partially-Implements: blueprint openstack-common-container
2015-08-31Remove dest_filename from build.iniSam Yaple1-1/+1
We can, and should, figure out the filename dynamically rather than hardcode that value in build.ini since it is not actually a configurable paramater. Change-Id: I496d6555e9fa356ab09e62063fd707f43ed08121 Closes-Bug: #1490386
2015-08-28Move docker_templates to docker dirSam Yaple7-0/+99
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-06-25Move glance-data container to the correct placeMartin André2-6/+0
It should be in docker/{centos,fedora,...}/binary/glance/glance-data and not directly at the root of docker directory. Change-Id: I9c4c260ef14f9b367dc86ccfb1a66d764d58ae01 Closes-Bug: #1468596
2015-06-18Set up glance to use a data container.Ian Main2-0/+6
Glance images were originally intended to be stored on the host (see container Dockerfile) but the compose file was not doing this. The right thing is to use a data container for image content. Closes-bug: #1465401 Change-Id: I02d2aab2913356939d98b8c18f9e788ae6d901af Co-Authored-By: Ryan Hallisey <rhallise@redhat.com>
2015-05-15Restructure builds to allow more flexibilitySam Yaple10-180/+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-05-06Glance has some undefined dependencies in Kilo packagingSteven Dake1-1/+3
Glance has two undefined dependencies. Without installing these dependencies out of band, glance will not operate. Change-Id: I096881467d8e0022d58e6c6f745e610d9332dd82 Partially-Implements: blueprint port-kilo
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