aboutsummaryrefslogtreecommitdiff
path: root/docker/swift
AgeCommit message (Collapse)AuthorFilesLines
2016-02-22Merge "Swift ubuntu binary container"Jenkins5-0/+30
2016-02-22Swift ubuntu binary containerMD NADEEM5-0/+30
Change-Id: I4ead909143c0089d5b07568b27dc37222da95561 Partially-Implements: blueprint binary-ubuntu
2016-02-10Safely create directoriesMartin André1-1/+1
This prevents failure when the directory already exists. This commit fixes a failure in centos-binary because of a change in the RDO packaging, where the required directory is now created for us. Change-Id: Idd3e15802c3e3fd363e1295111ec12948d566781 Closes-Bug: #1543417
2016-02-02Fix Swift for multinode P+ACO deploymentQiu Yu5-7/+3
Current Swift playbook is based on the preassumption of AIO setup. However, if one goes with default multinode setup (ansible/inventory/multinode), it follows the P + ACO deployment model, which proxy-server runs on controller nodes where ACO (account/container/object services) run on storage nodes. It will break because swift proxy-server no longer has access (it shouldn't have) to /srv/node path. This change ensure disk mounting part only happens on storage node. It also moves chown from proxy-server Dockerfile to rsyncd because no matter with PACO, P+ACO or P+A+C+O model, rsyncd is always running on each storage node. Change-Id: I3aa20454902caa9c84d3901bb91e4e4c93ac5f34 Partially-Implements: blueprint swift-physical-disk Closes-Bug: #1537544
2016-01-28Fix swift build issueSamYaple1-0/+13
Swift updates and new deps are needed, here is one Closes-Bug: #1538377 Change-Id: Ibb890c73e462113c5aa29ab12637a9115bb51240
2016-01-27Merge "Fix bug:xrange() issue with py3.x"Jenkins1-1/+1
2016-01-21Fix bug:xrange() issue with py3.xMD NADEEM1-1/+1
In python3.x, there is no method named xrange(), it has replaced by range(),which is equal to xrange() in python2.x. so we must fix this issue. Closes-Bug: #1268439 Change-Id: I66f0a7f248ad77bf06e96ea7cfcb7ef5f050b13a
2016-01-15Share the same image between swift servicesJeffrey Zhang14-109/+2
Get rid of swfit children images by share the same image in the swift account, swift object and swift container services Closes-Bug: #1534476 Change-Id: I929689f93b56396a41b19fda46e4679c4de84ca1
2015-12-27Fix pip install settingsSamYaple1-1/+1
There were some inconsistencies with pip install instructions thoughout Kolla. We fix those here. Additionally, we fix the virtualenv to properly use the site-packages on the host if a library is not available in the venv. Change-Id: Ib84d48e8826bb96060338b3fa0782620c98794a8 Related-Bug: #1524684 Closes-Bug: #1529434
2015-12-27Add missing contraintsSamYaple1-1/+1
There were some missing constraint caps on our pip installs TrivialFix Change-Id: I3d0af9556d08a9a0a99248a9992637d08fd3ad01
2015-12-22Add the rhel in the base_distro condition in swift dockerfileJeffrey Zhang6-6/+6
Closes-Bug: #1528446 Change-Id: I781a1f3617fedc96da5a0837ecf988fb9a366d44
2015-11-27Source installation in virtualenvMichal Rostecki2-4/+4
Use virtualenv for installation of OpenStack projects and dependencies to avoid conflicts with Python libraries installed by non-OpenStack binary packages. Change-Id: I21ecd673b2e93335b1d3dd4e279e940c9d694c3c Implements: blueprint virtualenv
2015-11-23Remove hardcoded MAINTAINER in DockerfilesSwapnil Kulkarni (coolsvap)17-17/+17
Added new option in kolla-build.conf Change-Id: I45fe51966bcb59ea19d112281ba3d5a1ba091a56 Closes-Bug:#1514304
2015-11-09Fix validate-all-maintainer.sh to look for Dockerfile.j2Angus Salkeld16-16/+16
And fix the fallout. Change-Id: Iccad3f4fdb0a6a7c14246df3408cae0425b833a5
2015-10-06Bring Kolla inline with FHSSam Yaple2-2/+3
This brings Kolla images inline with FHS and should make finding locations of things more consistent and reliable with the linux world at large. Change-Id: Iece5b4da4bace0fb8b1f41a65ab2c852ec73e6f8 Closes-Bug: #1485742
2015-10-06Common start.shSam Yaple34-260/+18
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"Jenkins17-17/+17
2015-09-28Merge "remove set_configs"Jenkins15-60/+0
2015-09-28Implement a install_type and install_metatypeSteven Dake17-17/+17
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 Yaple15-60/+0
Change-Id: I9bb0a1fac63cc326234b0f06b1e56b43e0753279 Partially-Implements: blueprint replace-config-external
2015-09-27Remove all fail sections for UbuntuSam Yaple1-7/+2
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-25Fix removal of config-externalSam Yaple15-15/+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 Yaple15-349/+0
Removes config-external for all services that have been replaced in Ansible Change-Id: I839a14418638b977fbc1d02ba6839811b0f909ea Partially-Implements: blueprint replace-config-external
2015-09-25Replace config-external - swiftSam Yaple15-112/+60
Change-Id: I785cb53d64cbf8dbc0fad97882f9fd0307982e5d Partially-Implements: blueprint replace-config-external
2015-09-13Merge "Add missing Swift services, also ansible configuration"Jenkins26-60/+418
2015-09-07Add rsyncd image and related Ansible for SwiftPaul Bourke3-0/+45
Swift replicator services require rsync to function. This patch adds a new container which is included automatically on each of the Swift storage nodes. Change-Id: If10fbe610ca4df21ef0f2c7a1025035d627cb4ba Partial-Bug: #1477993
2015-09-07Add missing Swift services, also ansible configurationjamesmmccarthy26-60/+418
DocImpact Closes-Bug: #1477993 Co-Authored-By: Paul Bourke <paul.bourke@oracle.com> Change-Id: Ifeab0fec11889cb0c90a56a6211dbdd27a40f3d9
2015-09-04Add 'rhel' for RPM distrosSteven Dake6-6/+6
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 Yaple29-0/+621
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 Yaple15-155/+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-06Port to icehouseSteven Dake5-5/+5
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-01Allow check_for_* functions to be consumed by wait_forMartin André3-6/+6
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-02Allow changing base imageMartin André5-5/+5
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-02-24Make swift files point at correct base packageSteven Dake3-3/+3
Swift containers were pulling in fedora-rdo-base when they should have been pulling in fedora-rdo-swift-base. Partially-implements: blueprint multi-baseos Change-Id: Ic0d03cbca5790aa3002110ba40a802957a481496
2015-01-19Cleanup required variables checks for all containersMartin André3-33/+18
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
2015-01-05Base all images on kollaglue onesMartin André5-5/+5
The `kollaglue` Docker hub namespace was missing for some of the images. Change-Id: Id0e0c7f62d638fc2ee79f27c07677abf2902e087
2014-10-22Update MAINTAINER in Dockerfiles to Kolla ProjectLars Kellogg-Stedman5-5/+5
Remove individual MAINTAINER information from Dockerfiles. Change-Id: I777df5cde049599dc786176e1d5b4b9597f0b334
2014-10-07Reorganize k8s structureSteven Dake1-106/+0
All services go to TLD/k8s/service All pods go to TLD/k8s/pod Change-Id: Iad2977a9f0cd5f430c4e0a566846bf4681618379
2014-10-07renamed keystone servicesLars Kellogg-Stedman3-3/+3
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-Stedman3-3/+3
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-94/+102
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-Stedman10-20/+5
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-03Swift: Remove trailing JSON commas that don't parseSteven Dake1-6/+6
Change-Id: Ic7eaf187e7f0fa9481c432a8b32971a470e75bf0
2014-09-25Add a push script for each of the separate daemonsSteven Dake5-0/+10
This pushes to the docker registry.
2014-09-25Make build tools build with kollaglue loginSteven Dake5-5/+5
Build with kollaglue login. Then we can upload all images under that user namespace.
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-05 23:33:47 +0000