aboutsummaryrefslogtreecommitdiff
path: root/docker/kolla-toolbox
AgeCommit message (Collapse)AuthorFilesLines
2019-11-29Enable repos only when neededMarcin Juszkiewicz1-0/+2
Disable external repositories by default and enable only when needed. Depends-on: https://review.opendev.org/696480 Implements: blueprint repos-off-by-default Change-Id: Icf2a8397a8349e0fe849d88d160409fd234480a9
2019-10-21Switch upper constraints in kolla-toolbox to use releases.o.oMark Goddard1-1/+1
This ensures we can use just the release name in OPENSTACK_RELEASE, rather than the branch name. TrivialFix Change-Id: I1902a5039cb9318d7d70387dd2dc142d915fd298
2019-09-25Install RabbitMQ in kolla-toolbox imageMark Goddard1-1/+14
This allows us to execute RabbitMQ Ansible modules in the kolla-toolbox container using the kolla ansible kolla_toolbox module. Partially Implements: blueprint support-nova-cells Change-Id: I2c10c7b4f7dbdd87f2dda7c40fa44cded07c57a5
2019-08-08Bump up pkg versions in kolla-toolboxMichal Nasiadka3-9/+12
Currently we use Ansible 2.2 in kolla_toolbox, while lowest supported version is 2.6 - bumping up to 2.8. * Use upper constrains in Dockerfile.j2, instead of pinning them in here - Ansible is pinned to 2.8.* * Add no_log=True in kolla_keystone_user * Add endpoint_type as a param in kolla_keystone_service - now AnsibleModule requires all options to be defined, otherwise it throws an UnsupportedParameter error * Add openstack_release variable in kolla/common/config.py which is used for fetching upper-constraints.txt for desired release Change-Id: I2cb0ea2fde1b408d48b39bf7a54b898e850d31aa
2019-06-06Debian/Ubuntu: move to Python 3 for source imagesMarcin Juszkiewicz1-1/+1
Commit 43b74ccc157c0b50138c3785ed91dab504895571 enabled use of Python 3 based packages but not switched to use Python 3. Some of images still contain Python 2. There are two reasons: - Ceph (ceph-common depends on Py2) - python3-ldappool on Ubuntu 18.04 In Ceph situation Py3 packages were added. For second one we can not do anything - Py2 dependency got dropped in Ubuntu 18.10 version. Removed neutron-server-plugin-networking-infoblox due to being not maintained. Once https://review.opendev.org/#/c/657578/ get merged someone may revert that part. Implements: blueprint debian-ubuntu-python3 Depends-on: Ie2a1077f7def0743f1403341985e2109aa490026 Change-Id: Ibfe0c2b8be98db56c61f74fb0247488ab3749ef4
2019-05-06[Trivial fix]Remove unnecessary slashzhufl1-2/+1
This is to remove the unncessary slash when the line doesn't exceed the length of 79, to make the code more readable. Change-Id: I53fdb56f001837e833df46cb86cdaab9c710ac99
2019-03-28Merge "Fixed file modes in toolbox:/usr/share/ansible"Zuul1-0/+5
2019-03-14Move to Debian 'buster'Marcin Juszkiewicz1-1/+1
Buster is at freeze phase so safe to update and use. Will give us Python 3 based OpenStack packages (usually release delayed). Change-Id: I48c2d252a834716f1bcf10b18f2d32fe541e8137
2019-03-12replace 'distro_python3' variable with 'distro_python_version'Marcin Juszkiewicz1-1/+1
RHEL7 derived distros use Python 2.7 RHEL8 uses Python 3.6 Ubuntu 18.04 uses Python 3.6, but we haven't enabled it yet. Debian:buster uses Python 3.7, but we haven't enabled it yet. We have several places in code where "/lib/pythonX.Y/site-packages" is used so we need to know value of X.Y rather than py2/py3 switch. How to check for Python 2: {% if distro_python_version == '2.7' %} Breaks: Iad6b70b433a0dd1b0f8ae6790fd280594517661a Change-Id: Ie24f109af19ae0438c21e0d43cb3cc947812b4ce
2019-03-11Introduce 'get_pip' macroMarcin Juszkiewicz1-3/+1
We have code for it in four places so it is a good candidate for macro. Change-Id: Icadcbbe5b386bdf688fd67e8160b40974f047377
2019-02-19debian/ubuntu: drop mysql compat stuff, unify on openssl 1.1Marcin Juszkiewicz1-17/+1
Now with Ubuntu 'bionic' being used we can drop libmysqlclient-compat-dev package use and just go with mariadb packages directly. Also move to OpenSSL 1.1 for both distributions. Change-Id: I147385a3da15878121c0a436b5c26ba100e9802d
2019-01-17Use base_package_typeAlex Schultz1-2/+2
This change updates the docker files to use base_package_type instead of doing specific distro checks for the rhel/deb generic cases. The base_distro is still available and is used when a specific distro needs a customization but if the differences are purely rpm vs deb, then the base_package_type can be used. Change-Id: I8d720bb185df65a0178061ccf20b1ab2265da2c5
2018-12-27Update hacking versionconfi-surya4-16/+20
Use latest release 1.1.0 and compatible changes w.r.t pep8 Change-Id: Ia3d1166a2746a46591e4e5a04ea91e03ddc28d93
2018-12-11Required changes for mariadb 10.3Eduardo Gonzalez1-1/+1
Mysql-python is a deprecated package and fails to build currently. Make use of mysqlclient as is a fork of mysql-python with many bug fixes a python3 support. percona xtrabackup doenst work with mariadb 10.3, replaces to use mariadb-backup tool. https://jira.mariadb.org/browse/MDEV-15774 Change-Id: Icefe3a77fb12d57c869521000d458e3f58435374
2018-10-09Fixed file modes in toolbox:/usr/share/ansibleGary Perkins1-0/+5
Sometimes, when deploying with user root, the local repo has files of mode 0600. This has been found to cause "Permission denied" errors when deploying Glance. This little fix is to explicitly set a more permissive file mode on those files to allow the deployment of Glance to setup it's service and endpoints. Change-Id: I30ea6898e7bf1b6713cb41656420e8d515be224e Signed-off-by: Gary Perkins <gary@garyperkins.com>
2018-09-12Handle role properly when it is changed in kolla_keystone_user moduleJeffrey Zhang1-0/+6
Change-Id: I128559f9bcfe48b786a3f52fe4e04bd47cac7a7d Closes-Bug: #1791896
2018-08-27Fix bluestore disk naming format in kollawangwei1-31/+8
The current bluestore disk label naming is inconsistent with the filestore. The filestore naming format is that the disk prefixes belonging to the same osd are the same and the suffixes are different. This patch keeps the bluestore's disk naming as well. Change-Id: I090cf055ebedc555b5ada35e140b7a7bb2a4cf8f
2018-06-20Allow Kolla Ceph to deploy bluestore OSD with 4 partitionstone.zhang1-30/+56
Enhance the deployment of Kolla-Ceph bluestore OSD. Deploy bluestore OSD including up to 4 partitions: * one partition is for bluestore OSD information * one partition is for bluestore block * one partition is for bluestore block.wal * one partition is for bluestore block.db Deploy bluestore OSD deployment with LOOP devices. Partially-Implements: blueprint kolla-ceph-bluestore Change-Id: I00eaa600a5e9ad4c1ebca2eeb523bca3d7a25128 Signed-off-by: tone.zhang <tone.zhang@arm.com>
2018-06-08Update Monasca base and API imagesDoug Szumski1-0/+1
* Support deploying APIs via Apache + mod_wsgi * Include InfluxDB client so that the Monasca API can talk to InfluxDB. Support for Cassandra can be added in a later commit. Change-Id: If71db99d4731967e814c5263f2c2d6f90391c2a6 Partially-Implements: blueprint monasca-containers
2018-06-07Allow Kolla Ceph to deploy bluestore OSDs in KollaTone Zhang1-1/+141
Support Kolla Ceph to deploy blustore OSDs. With the patch, Kolla Ceph can deploy bluestore OSDs on ONE, TWO or THREE storage devices. Before deploy bluestore OSD, please prepare devices. The detailed Please refer to [1] for devices initialization. extend_start.sh: initialize and start bluestore OSD find_disk.py: search the devices for bluestore OSD [1]: specs/kolla-ceph-bluestore.rst Partially-Implements: blueprint kolla-ceph-bluestore Change-Id: I832f490de63e1aeb68814697cda610a51b622c1f Signed-off-by: Tone Zhang <tone.zhang@arm.com>
2018-06-01Fix sudoers for CephPaul Bourke1-1/+1
Since moving ansible to a virtualenv in the toolbox Ceph could not run find_disks. Change-Id: I8bce61887273f1c27ab79edec947d36a3aab3c48
2018-05-30Put upper limit on cmd2 in kolla-toolboxMartin André1-0/+1
This fixes an issue with cmd2 >= 0.9.0 requiring python3. Change-Id: I08b606980cb796a6b884e69b3e6749edbdd7cf37 Closes-Bug: #1773938
2018-05-21kolla-toolbox: fix os_config_client path for DebianMarcin Juszkiewicz1-2/+0
(venv-for-kolla) 12:04 (438s) linaro@c1n1:kolla$ docker run -it -u root haerwu/debian-source-kolla-toolbox:6.0.0 bash ()[root@f93a6cc8afb2 /]# find / -name defaults.json /opt/ansible/lib/python2.7/site-packages/openstack/config/defaults.json /opt/ansible/lib/python2.7/site-packages/os_client_config/defaults.json And we were looking at wrong path: Change-Id: I4fd403f0f0cff0628e93872d9f0d2f56591980f9 00:33:42.029 ERROR:kolla.common.utils.kolla-toolbox:The command '/bin/sh -c pip --no-cache-dir install --upgrade ansible==2.2.0.0 MySQL-python os-client-config==1.29.0 pbr==4.0.0 pymongo python-openstackclient==3.14.0 pytz pyudev shade==1.27.1 && mkdir -p /etc/ansible /usr/share/ansible && echo 'localhost ansible_connection=local ansible_python_interpreter=/opt/ansible/bin/python' > /etc/ansible/hosts && sed -i 's| "identity_api_version": "2.0",| "identity_api_version": "3",|' /usr/local/lib/python2.7/dist-packages/os_client_config/defaults.json' returned a non-zero code: 2 00:33:42.029 INFO:kolla.common.utils:Attempt number: 2 to run task: BuildTask(kolla-toolbox)
2018-05-17Move ansible to virtualenv in kolla_toolboxJeffrey Zhang1-5/+16
Now the ansible and its python dependencies are installed on system. It may be failed to install in some case. This patch installs python packages in virtualenv for kolla_toolbox image. Closes-Bug: #1771717 Change-Id: I3c4465d5dfe4f909521fa00173f1cf8d9eec783f
2018-04-02Bump the package version number in kolla_toolbox iamgeJeffrey Zhang1-4/+4
Change-Id: I58edccd933f46e7778860f70abbc01bfb85b531e Close-Bug: #1760517
2018-01-21Consume RDO packaged mariadb versionSteven Dake1-16/+2
RDO packaged mariadb recieves far more testing and qualification than any other mariadb package on CentOS. Lets use that instead of a hard-pinned old version of mariadb from mariadb.org. This patch also upgrade MariaDB from 10.0 to 10.1.20 for RHEL/CentOS/Oracle Linux. Depends-On: I8374ac2219ad7880970cd789727d01af7cac1077 Depends-On: Ia2acb09e877a586243fc1acb49d8d140cf27d7b5 Co-Authored-By: Xinliang Liu <xinliang.liu@linaro.org> Change-Id: I071362fc1b8d60199a77e2fe0475d2b4c3b5341b
2017-11-15Merge "Install python-openstackclient in kolla-toolbox container"Zuul1-0/+1
2017-11-14Install python-openstackclient in kolla-toolbox containerJeffrey Zhang1-0/+1
in the past, shade depends on python-ironicclient and python-ironicclient depends on python-openstackclient. But in the recent released python-ironiclient 2.0, python-openstackclient is removed[0]. So python-openstackclient is missing. This will affect all branches. Here is a potential issue. we need use upper-constraints.txt file in kolla-toolbox. install the latest python packages is not a good idea. Implement this may take much time. Let us fix the gate ASAP and improve this later. [0] https://review.openstack.org/#/c/297730/ Partial-Bug: #1732180 Change-Id: I55810b641e388e26129b7fa77f97a8736eb1bb48
2017-11-13Merge "Add ansible sudo running for Debian family"Zuul1-1/+1
2017-11-02Add ansible sudo running for Debian familyXinliang Liu1-1/+1
On Debian and Ubuntu pip install ansible to /usr/local/bin/ansible, whereas on CentOS the location is /usr/bin/ansible. Add ansible sudo running entry for Debian family. Partial-Bug: #1729216 Change-Id: I2b57403128bc103148ae696c219df52590214adc Signed-off-by: Xinliang Liu <xinliang.liu@linaro.org>
2017-09-20Merge "Use immutable journal path rather than device name"Jenkins1-1/+21
2017-08-15kolla-toolbox: fix version dependency of pbr & os-client-configZhangfei Gao1-1/+2
When deploying on arm64, got error: ContextualVersionConflict: (pbr 1.10.0 (/usr/local/lib/python2.7/dist-packages), Requirement.parse('pbr!=2.1.0,>=2.0.0'), ContextualVersionConflict: (os-client-config 1.26.0 (/usr/local/lib/python2.7/dist-packages), Requirement.parse('os-client-config>=1.27.0'), set(['openstacksdk', 'osc-lib'])) VersionConflict: (os-client-config 1.27.0 (/usr/local/lib/python2.7/dist-packages), Requirement.parse('os-client-config>=1.28.0')) Fix the issue via updating pbr & os-client-config version Change-Id: If567489daecc53054535452069bce6d56c96efd1 Signed-off-by: Kevin Zhao <kevin.zhao@linaro.org> Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
2017-08-14Use immutable journal path rather than device nameJeffrey Zhang1-1/+21
Device name is mutable when removed or added disks. Use uuid path or lable is more robust. Change-Id: I95cae6a9bf185d6f81126c42ac72d51b5ed659c2 Closes-Bug: #1710058
2017-07-01Merge "Bump the ansible version to 2.2.0"Jenkins1-1/+1
2017-06-30Merge "Clean up unused sanity check modules"Jenkins1-17/+1
2017-06-30Bump the ansible version to 2.2.0caoyuan1-1/+1
Bumping the ansible version in kolla-toolbox to be in sync with the min version from kolla-ansible. Depends-On: I99f3c5678f6d2d1f93d61c660fbd166184ff6422 Change-Id: Iabdaf920baf17e76f2e850c2834aa25a30b8b599
2017-06-12Fix kolla-toolbox buildEduardo Gonzalez1-0/+1
``pynacl`` package need ``make`` to build. kolla-toolbox build is failing due ``make`` missing package. pynacl upstream bug: https://github.com/pyca/pynacl/issues/298 Change-Id: Ifbb86ec2888284cfbda5e567cb1748432658953c Closes-Bug: #1697300
2017-05-22Clean up unused sanity check modulesPaul Bourke1-17/+1
These are now replaced with built in Ansible modules Change-Id: I6e3f4b72243da1cfa76d32822ec4f75f689f7317
2017-05-10Merge "handle mariadb for aarch64/ubuntu/source"Jenkins1-1/+9
2017-05-09kolla-toolbox: use proper mariadb packages on CentOS/non-x86Marcin Juszkiewicz1-2/+1
I did wrong selection of mariadb packages as there is no 'mariadb-shared' package in CentOS - it is integrated into 'mariadb' one. Change-Id: I960da5f87814de6ed8cee7c04ad67f801315b932 Partially-Implements: blueprint multiarch-and-arm64-containers
2017-05-04handle mariadb for aarch64/ubuntu/sourceMarcin Juszkiewicz1-1/+9
Ubuntu builds use external MariaDB repository on x86-64 and ppc64le. But that repo does not provide packages for AArch64 so I use mariadb/mysql packages from distribution instead. Partially-Implements: blueprint multiarch-and-arm64-containers Change-Id: Ia3c3d3858082613718626670f9ff11b69d913c40
2017-05-03Override image's meta info.Jawon Choo1-1/+1
centos based images have wrong label info, these changes fix own image's name and build-date. Change-Id: I1d13f8f386c8db12b5fbe5f8ecbbf9e3fbb4ba1c Closes-Bug: #1680341
2017-04-25Merge "Add pymongo module for creation of MongoDB via Ansible"Jenkins1-0/+1
2017-04-24Merge "mariadb: handle lack of external repos on non x86"Jenkins1-3/+17
2017-04-20Merge "Use LABEL instead of MAINTAINER (deprecated) in all Dockerfile.j2"Jenkins1-1/+1
2017-04-20Use LABEL instead of MAINTAINER (deprecated) in all Dockerfile.j2Chen1-1/+1
Use LABEL instruction instead of MAINTAINER (deprecated) instruc- tion as suggested by Docker's official dockerfile guide. docs.docker.com/engine/reference/builder/#maintainer-deprecated Closes-Bug: #1683652 Change-Id: Ie87a1ddf31aefcd0b623fd2837d78de420e76898
2017-04-14Add pymongo module for creation of MongoDB via AnsibleVladislav Belogrudov1-0/+1
Change-Id: I82fb48ac2087fa79a8ecea0f76609a20d6a3dbe4 Partial-Bug: #1682813
2017-04-13debian: move to stretchMarcin Juszkiewicz1-3/+8
Debian 'jessie' even with backports lacks some packages Kolla expects. Due to this we (Linaro) move to Debian 'stretch' release with our OpenStack work. Stretch is now frozen so there should not be many changes. Partially-Implements: blueprint multiarch-and-arm64-containers Change-Id: Iab7232cbe6f8fc3e3de10c67f3d89f134b185f05
2017-04-10mariadb: handle lack of external repos on non x86Marcin Juszkiewicz1-3/+17
MariaDB-* packages are from external 'x86_64 only' repository. Other architectures use CentOS packages. Split needs to be done as 'mariadb-devel' is provided by three different packages on x86-64. Partially-Implements: blueprint multiarch-and-arm64-containers Depends-On: I71ddb7ef57c64d2505cac96724b1ab6772a57d6a Change-Id: I9f3394eb35723f2bbf3205c6af6101b5a9daed38
2017-04-04debian: enable all images enabled for UbuntuMarcin Juszkiewicz1-1/+1
Debian support is not maintained in Kolla so it got a bit behind Ubuntu one. This changeset enables Debian for all images. Jessie (even with backports) may be too old for some images though. Also unify distro check to ['debian', 'ubuntu'] to keep alphabetical order like it is done for RPM distributions. Partially-Implements: blueprint multiarch-and-arm64-containers Change-Id: I056233fbfa277e0e2360c07c3f80d9558c554357
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-05 23:55:53 +0000