aboutsummaryrefslogtreecommitdiff
path: root/kolla/cmd
AgeCommit message (Collapse)AuthorFilesLines
2016-01-18Expose the docker build_arg to build.pyJeffrey Zhang1-1/+2
With this implement, we can add variables at building stage. For example, add HTTP_PROXY and NO_PROXY when needed like below. build.py --build-args \ HTTP_PROXY:http://127.0.0.1:8080,NO_PROXY:127.0.0.1 More info about build_arg, pls check[0] [0] https://docs.docker.com/engine/reference/commandline/build/#set-build-time-variables-build-arg DocImpact Implements: bp add-buildargs Change-Id: I29ed7f536670fef59d697603dc562a69d90743c9
2016-01-16Use dict.items() for adding Python 3 compatibilityting.wang1-2/+2
Replacing dict.iteritems()/.itervalues() with six.iteritems(dict)/six.itervalues(dict) was preferred in the past, but there was a discussion suggesting to avoid six for this. ref: http://lists.openstack.org/pipermail/openstack-dev/2015-June/066391.html Partially implements: blueprint python3 Change-Id: Ie931bc02f558f6db3677b44f645eb3bdf78ccae8
2016-01-08Merge "Fix the package source don't register issue"Jenkins1-7/+8
2016-01-07Fix the package source don't register issueJeffrey Zhang1-7/+8
Closes-Bug: #1531848 Change-Id: I3c6ceb9f1f367b8b19ab1b1d06c67817ab93cabb
2016-01-07Merge "Log information about successful push only if it really is"Jenkins1-1/+2
2016-01-07Fix broken local and global buildingSamYaple1-4/+13
Two things broke in the related patches. This patch aims to fix that. 1) tools/build.py was no longer usable as it imported kolla from the global pip install source. If that didnt exist (because kolla wasn't installed with pip) then it breaks on import. 2) When kolla was installed globally it looked up the path that matched the installation of docker-py instead of looking up a path that had the stuff we wanted (kolla images directory) Change-Id: I94f1856547ce54d506de72926b08c966a36ac608 Related-Id: I05f10d13e7ba1e2b985c2944aec71ce55630442b Related-Bug: #1530256 Closes-Bug: #1531569
2016-01-06Log information about successful push only if it really isMichal Rostecki1-1/+2
The try-except-finally block in push thread was catching only ConnectionError and logging information about successful push even if some other error occured during push. TrivialFix Change-Id: I94f5ed67237d291701469a65f76146881cd67a35
2016-01-06Merge "Fix the kolla to find the docker image folder in virtualenv"Jenkins1-25/+18
2016-01-06Gen the image dependency in the Graphviz dot formatJeffrey Zhang1-0/+20
By using ./tools/build.py --save-dependency a.dot to gen the Graphviz dot dependency file. Later, you can use the `dot` to draw the picture. dot -Tjpg -o a.jpg a.dot Implements: blueprint images-dependency-tree Depends-On: I8e07a1b69fab5f1c587470bfd2104aaba93f0050 Change-Id: If00f4f3fb9d0b10a07ab2abb7ffb1cd9d64902f2
2016-01-06Merge "Generate the kolla-build.conf file using oslo_config"Jenkins1-151/+7
2016-01-06Merge "Do not truncate the error messages"Jenkins1-1/+1
2016-01-06Fix the kolla to find the docker image folder in virtualenvJeffrey Zhang1-25/+18
Closes-Bug:#1530256 Change-Id: I05f10d13e7ba1e2b985c2944aec71ce55630442b
2016-01-06Generate the kolla-build.conf file using oslo_configJeffrey Zhang1-151/+7
Closes-Bug: #1530122 Change-Id: I96039eade2aacf1bcd9d14d958cdddd915fc9a5c
2016-01-06Do not truncate the error messagesWanlong Gao1-1/+1
Do not truncate the error messages of build failure images. TrivialFix Change-Id: I4f2da78c57c8d919beba84a10357312bfc66e88c Closes-Bug: #1531152
2016-01-05Replace xrange() with range() in six.movesWanlong Gao1-3/+4
range maps to xrange() and range() in python2 and python3 respectively. TrivialFix Change-Id: I9b2477a17a570c3ce945badacbfa44889c0634a9
2016-01-05Use range() from six.movesWanlong Gao1-1/+1
To improve consistency, use range() from six.moves TrivialFix Change-Id: I3bb67b2bb5bedbc5b46f70d7eeeca7f8b7872250
2015-12-31Merge "use oslo.config instead of raw argparse.ArgumentParser"Jenkins1-161/+171
2015-12-30use oslo.config instead of raw argparse.ArgumentParserJeffrey Zhang1-161/+171
* Use oslo.config library * kolla-build section is deprecated in favor of DEFAULT section * Remove the deprecated `--template` option * `--no-cache` is deprecated in favor of `--cache` and `--nocache` options, which are using oslo BoolOpt inverse feature[0] [0] https://github.com/openstack/oslo.config/blob/master/oslo_config/cfg.py#L1074 Closes-Bug: #1528542 Change-Id: I62c5ca3c8e057917d2798256e9d9efc8f6578f60
2015-12-30Make the logging more safeJeffrey Zhang1-4/+4
TrivialFix Change-Id: I72c541c1846e503486b402e88d5b29364920fc83
2015-12-28Merge "Push the image as soon as it is built successfully"Jenkins1-24/+58
2015-12-28Push the image as soon as it is built successfullyJeffrey Zhang1-24/+58
Closes-Bug: #1529327 Change-Id: Iad6c1454f42d3410c82c722b60d0d305b9eec129
2015-12-25Fix logging paramsSamYaple1-1/+1
Something was missed during the logging update TrivialFix Change-Id: Ic611b7a0e2a53725b1a3a76aba56faeca5f68dfa
2015-12-24Make the yum repositories configurable in the base imageDavid Moreau Simard1-1/+49
- Removed hardcoded yum repository configuration in favor of commands dynamically generated based on repo-url and repo-file arguments. We maintain a sane default set of repositories. - Added generic rpm_setup_config parameter to add support for installing .rpm or .repo files before building containers. Co-Authored-By: Ryan Hallisey <rhallise@redhat.com> Implements: blueprint custom-repos Change-Id: I1b3a7647a9e7239de3cd162cb6f464f05632bde1
2015-12-23Use c-style string interpolation for log messages in kolla-buildMichal Rostecki1-47/+43
TrivialFix Change-Id: I4b01402f8feb029563a90d4941c8d829a05794e0
2015-12-17Add kolla version to base containerMichal Jastrzebski1-1/+2
We want to record kolla version of running containers to be able to detect whether or not we need to perform certain downtime-causing actions during upgrade. Change-Id: Ie113029da98303e6809d56edbf6d8de37be128d7 Implements: blueprint record-version
2015-12-15Alphabetically sort long list of parameters/argumentsDavid Moreau Simard1-47/+46
TrivialFix Change-Id: I39ad214d6a8e1fbdba799076d6a5371cc47824a1
2015-12-11Record version on container buildMichal Jastrzebski1-1/+9
This changes default behaviour of build.py to instad of putting latest tag on it, it puts current kolla version as found in setup.cfg Change-Id: I4d6e9a0159c6a5598abd58072594df4204427308 Partially-Implements: blueprint upgrade-nova Partially-Implements: blueprint record-version
2015-12-11Catch exception when directory creation failsMartin André1-4/+15
The build script now creates now creates a plugins directory for source builds to store plugins required for the container, and creates a tar of all plugins that is extracted at runtime. However, the creation of the 'plugins' directory is not handled correctly and generate an exception in the running thread if the directory exists. This is the case for example if the build script retries a failing image. This commit fixes the timeout issues we've experienced with the gate. Change-Id: Ic5d4fd1ddf71f01c547130518e311fded911c445 Closes-Bug: 1524897
2015-12-08Merge "Allow fetching plugins as part of the build"Jenkins1-19/+46
2015-12-03Set docker api version to autoArtur Zarzycki1-2/+7
Change-Id: I25d957a2368fa4e52b5fa9253d7ea5ec4046d830 Closes-Bug: #1521949
2015-11-30Allow fetching plugins as part of the buildPaul Bourke1-19/+46
This change allows additional archives to be fetched as part of the build and added to images. An example use case is the installation of plugins for neutron. For example, to add the networking-arista plugin to neutron-server, one would do the following in kolla-build.conf: [neutron-server-plugin-networking-arista] type = url location = http://tarballs.openstack.org/networking-arista/networking-arista-master.tar.gz The format for plugin sections is <image-name>-plugin-<plugin-name> The required Dockerfile additions will be added in the next patchset. Background to this change: https://review.openstack.org/#/c/207545/3/docker_templates/neutron/neutron-server/Dockerfile.j2 Related: blueprint neutron-third-party-plugins DocImpact Change-Id: Idec2ca9fd06163c7d820e8c4bc9ebca8d9673856
2015-11-23Remove hardcoded MAINTAINER in DockerfilesSwapnil Kulkarni (coolsvap)1-2/+5
Added new option in kolla-build.conf Change-Id: I45fe51966bcb59ea19d112281ba3d5a1ba091a56 Closes-Bug:#1514304
2015-11-22Add error handler for unknown build typeHui Kang1-1/+10
Change-Id: Ia5d9ad1ffa119c2dd3e74272df3fb6d78501ec09 closes-Bug: #1513175
2015-11-16Add Python 3.x supportMichal Rostecki1-12/+11
Implements: blueprint python3 Change-Id: I1e02568907aa38dd0efcb428235004ce47d73af8
2015-11-10Fix --retries option to kolla-buildMartin André1-1/+1
Off by one error made the --retries option control the number of tries rather than the number of retries. Closes-Bug: #1514730 backport: Liberty Change-Id: I976a8bb9e489d226f44926a6562d4d2af5de099c
2015-11-06Merge "Make RHEL build properly"Jenkins1-11/+12
2015-11-06Merge "Few improvements in Kolla tools. Added Ubuntu support."Jenkins1-7/+20
2015-11-06Few improvements in Kolla tools. Added Ubuntu support.Kirill Proskurin1-7/+20
pip install default prefix in Ubuntu is /usr/local, and Kolla tools scripts didnt respect that. So I added few OS checks in this scripts. I improve config path check in build.py. Added more verbose error if we can't find config directory. Change-Id: Ide521ed205b0dc1fc27e237a9a8f4da0168e664f Closes-Bug: #1512302
2015-11-06Make RHEL build properlySteven Dake1-11/+12
build.py -b rhel -t [rdo|rhos|source|binary] The last patch for this didn't quite fix the problem properly as it only permitted RHOS builds. backport: liberty Change-Id: I27eed202560adce450c07d043cc224e7a6c6bbf6 Closes-Bug: #1513088
2015-11-06Use the absoluate pathJeffrey Zhang1-1/+1
Use the absoluate path rather than that with `..`. This will be helpfull for end-user to see where is the folder/file. Closes-Bug: #1513726 Change-Id: I7169952d874ddf14469605444044de0163b033d3
2015-11-04Fix RHEL buildsRyan Hallisey1-0/+2
Register with RHEL on the host machine and use yum to setup the repos in the container. Change-Id: I38aaf43fffaf7a235e69b330d5d9f0f1be31fe83 Backport: Liberty Closes-Bug: #1513088
2015-10-19Add build profiles to build.pyPaul Bourke1-1/+29
Add ability to define "profiles" in kolla-build.conf, which are predefined sets of images to build at once. The supplied profiles match what Steven defined in the restructure-template bp, though others can easily be added by the user. Multiple profiles can be supplied at once, as well as supplemented by the existing regex mechanism, e.g. to build profiles infra, main, and also ironic, one can use: tools/build.py --profile infra --profile main ironic Change-Id: I0c6f450152cb23dcfc58e0969669fcedf03fab01 Implements: bp restructure-template Doc-Impact
2015-10-17add "registry" flag to "tools/build.py"Kuo-tung Kao1-2/+10
With registry flag, build image using `tools/build.py --registry 172.22.2.81:4000` the image name looks like `172.22.2.81:4000/kollaglue/data` When user use kolla-ansible, user set `docker_registry` to `172.22.2.81:4000` in `/etc/kolla/globals.yml`. Build image using `tools/build.py -n abcd` the image name looks like `abcd/data` When user use kolla-ansible, user set `docker_namespace:` to `abcd` in `/etc/kolla/globals.yml`. build image using `tools/build.py -n abcd --registry 172.22.2.81:4000` the image name looks like `abcd/data` When user use kolla-ansible, user set `docker_namespace:` to `abcd` in `/etc/kolla/globals.yml`. user set `docker_registry` to `172.22.2.81:4000` in `/etc/kolla/globals.yml`. With the feature, it will reduce user confusing and mistaking. Change-Id: I18ac7a3ccec032888e35f5e9a79fc190760cc8a0 Closes-Bug: #1505056
2015-10-05add "--template-only" flag for tools/build.pyKuo-tung Kao1-1/+8
Add "--template-only" flag for tools/build.py to generate dockerfile for read easily. Change-Id: Ic4cf43d925b5f2d3dae809c11f3f95c51b4bbce2 Closes-Bug: #1501671
2015-09-28Implement a install_type and install_metatypeSteven Dake1-8/+21
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-21Consolidate kolla-build configuration in one fileMartin André1-2/+2
The source location definition previously in build.ini was merged in etc/kolla/kolla-build.conf since it is really configuration for the kolla-build tool. Change-Id: I7531af0029bdfeabbaefb8a6aa97b70bb12c021a Closes-Bug: #1496702
2015-09-17Implement configuration file for kolla-buildMartin André1-60/+81
Kolla build script configuration now lives in /etc/kolla/kolla-build.conf. This allows overriding configuration options without the need to pass arguments on the command line. Command line arguments still get precedence. Closes-Bug: #1496185 Change-Id: I69482a11437087f19d7f76b379dca85b1f622268
2015-09-07Correct name of source archive if reference contains '/'Vladislav Belogrudov1-1/+2
If we have reference like stable/kilo name of source archive will contain only last part of reference. We should replace '/' with '-' to have full name. This is useful for correct identification of source code afterwards. Change-Id: I1ff1015e3f7926110d0fcb59504e58a5e80a75f9 Closes-Bug: #1492279
2015-09-03Allow arbitrary source archive name to be imported into DockerfileVladislav Belogrudov1-10/+8
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-08-31Remove dest_filename from build.iniSam Yaple1-4/+2
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
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-06 00:29:03 +0000