summaryrefslogtreecommitdiff
path: root/docker
AgeCommit message (Collapse)AuthorFilesLines
2020-01-08horizon: fix build in stable branchesMarcin Juszkiewicz1-0/+2
When [1] was committed, horizon stopped building for Train. Analogous patch is proposed to other stable branches. This patch removes horizon from upper-constraints. Kolla master is affected directly because we build Train for CentOS 7 atm. [1] https://opendev.org/openstack/requirements/commit/3e54878f9c87266e1b9775f72af06de27a3dad65 Co-authored-by: Radosław Piliszek <radoslaw.piliszek@gmail.com> Change-Id: I1bd5a40eeef9612d995c81426fe510e89f438725 (cherry picked from commit 8b7ec43536842dd500cc5ee1198a318070ac1046)
2019-12-17Fix monasca-grafana being unbuildable due to old npmRadosław Piliszek1-1/+6
Affected builds on Ubuntu which had: npm 3.5.2 while the latest was: npm 6.13.4 And CentOS had: npm 5.6.0 This patch runs npm update via npm. Pinned to 6.x. Additionally, this moves npm packages prefix (root) to /usr/local to avoid conflicts with native packages. Change-Id: Ibaacc1cc478b2b2f8196a5da4eea3570d7d310ff Closes-bug: #1856699 (cherry picked from commit 308e85aa413da84ed107b27fa09a3f0e0a64392f)
2019-12-10Merge "Update skydive version to 0.26.0" into stable/trainZuul1-1/+1
2019-12-10Merge "Vitrage: build images for Debian" into stable/trainZuul5-0/+57
2019-12-10Update skydive version to 0.26.0Michal Nasiadka1-1/+1
Change-Id: Idae69105739a57937fb5ad596078dafc6a32f1d5 (cherry picked from commit c82ab3cdcec673eb4f0ed38f4604bf21301d804b)
2019-12-09Merge "Fix keystone bootstrap error message display" into stable/trainZuul1-1/+5
2019-12-09Vitrage: build images for DebianViktor Michalek5-0/+57
Change-Id: I73b1964b7b22f1a2d5637209b86559b79602131b
2019-12-09Fix keystone bootstrap error message displayMark Goddard1-1/+5
In some situations, Keystone bootstrap can fail, and then unhelpfully fails displaying the error message output by the 'keystone-manage bootstrap' command. This appears to be due to unprintable control characters in the error message which prevent the output of the script from being valid JSON. This change fixes the issue by piping the output through 'cat -v', which replaces unprintable characters with control codes. Change-Id: I82444bc2272311023cc9e92c5a298d1c4c87483b Closes-Bug: #1855701 (cherry picked from commit bcca3fabe305c1e206fdb231c31809ceff2d4774)
2019-12-08Ensure lsb-release exists on debian/ubuntuDincer Celik1-1/+3
Change-Id: I74142928d97af932a04e33476771360579e01ee7 Closes-Bug: #1853474 (cherry picked from commit 05c84fdf86d62545043cd36b984ca7627308d63d)
2019-12-05Install etcd3gw to fix Ubuntu binary tooz coordination9.0.0.0rc29.0.0Radosław Piliszek1-0/+1
Change-Id: Ib56e62d1fb4d0fc4a6c627b87a929be0bc614d1e Closes-bug: #1852086 (cherry picked from commit 0186c5e3cafeae0bb1c39bdef0df6ade827552d5)
2019-12-03Merge "Use ovn-ctl script to start OVN ovsdb-servers" into stable/trainZuul8-62/+52
2019-12-02Merge "Horizon: install vitrage dashboard on Debian" into stable/trainZuul1-0/+1
2019-11-29Horizon: install vitrage dashboard on DebianViktor Michalek1-0/+1
Change-Id: I4e60fcd767f15b7da90b0143008b1d6d794c76f2 (cherry picked from commit 683f9c9178ec541d2ab8f92883da66d8e2f1b956)
2019-11-25Neutron: apply db migration for BGP dynamic routing agentViktor Michalek1-0/+1
Change-Id: Id84d5a1b3c70c0260b85ed7c24aa7f1e007c12d6 Closes-Bug: 1848572 (cherry picked from commit 89372f0c5f312c222fe769a2aab8d1fce445dd84)
2019-11-21Designate: pool-manager has been removedViktor Michalek1-1/+0
Change-Id: I4a7bbfaf3c30c57432de056f701d8abc7992d142 Closes-Bug: 1852784 (cherry picked from commit 63bd1c9124f6480b49885d9ccea3fc6100d50420)
2019-11-21base: generate en_US.UTF-8 locale data for Debian/Ubuntu systemsMarcin Juszkiewicz1-0/+3
Change-Id: Id2463692f5a633b6e50af6e7ce6e3f49612e4c5d Closes-bug: #1852452 (cherry picked from commit 19ba215f8c0de9a1a0aa8cc40d96fc841ee80df1)
2019-11-15Use ovn-ctl script to start OVN ovsdb-serversNuman Siddique8-62/+52
Using the ovn-ctl script to start the OVN ovsdb-server is the better way. This script is used to start and stop all OVN systemd services. This script takes care of creating the database from the schema, updating the database from the schema when the schema version gets updated. The present scripts - start_nb_db_server.sh and start_sb_db_server.sh doesn't take care of schema updates. With this, we don't need extend_start.sh in ovn-nb-db-server/ovn-sb-db-server to create the database from the schema. This patch also deletes kolla_ovn_extend_start from the ovn-base image as it is not required. Closes-bug: 1850025 Change-Id: I31a372d801dace92950cd85b29b308431f78bbdb (cherry picked from commit b8c8fa15edcf5336a1121155cdc880a35ccf161f)
2019-11-11Merge "[manila] Fixes manila-share on debian/ubuntu" into stable/trainZuul1-0/+2
2019-11-11[manila] Fixes manila-share on debian/ubuntuDincer Celik1-0/+2
manila-share cannot start on debian/ubuntu because python3-cephfs is missing. Change-Id: Ia592dda4ee20979c701efe6007f236dba9848997 Closes-Bug: #1851692 (cherry picked from commit 1d5a208c2e5c81ed4169c63d1d5ea0ad31b78f2f)
2019-11-08swift-rsyncd: don't recursively chown /srv/node at startupMartin Chlumsky2-3/+3
Instead of doing a recursive chown on /srv/node, chown only /srv/node and any immediate subdirectory under /srv/node. Change-Id: I8fd93fa77ba9fc63910360300b8783a34bd4e6d5 Closes-Bug: #1851169 (cherry picked from commit 2d122afaf9817cadc668b308c4f736e47c09a55f)
2019-11-06Limit centos repo disable to centos hosts onlySagi Shnaidman1-0/+2
Run dnf or yum to disable centos repos only if used on centos machine. Closes-Bug: #1851135 Change-Id: If6f05237c2512c643857765eecf452f5416b3d60 (cherry picked from commit e4b37201a596dbe242887ba51d7092eaed11a0cf)
2019-11-06Fix centos qdrouterd for centos > 7Sagi Shnaidman1-1/+1
Yum doesn't present in centos/rhel version 8, we'll need to use dnf in that case. Change-Id: I2ccbfe4ae55c6a3653d8c03a12e6bca64e58d396 Closes-Bug: #1851135 (cherry picked from commit 31a061099b0c518fc43ded1e1a675ad257b6d57d)
2019-10-31Merge "Add xfsprogs to nova-compute"Zuul1-4/+8
2019-10-30Merge "Change ODL repo to nexus.opendaylight.org"Zuul1-3/+2
2019-10-30Add xfsprogs to nova-computeMartin Schuppert1-4/+8
xfsprogs is required for formatting XFS ephemeral disk partitions when format=xfs is specified as instance create failes with 'mkfs.xfs: No such file or directory' due to missing xfsprogs package in the nova-compute container. Closes-Bug: #1850610 Change-Id: Iaf3414464f3dd747427247339c6b201b352063cb
2019-10-29Merge "base: use en_US.UTF-8 locale on all distros"Zuul1-1/+1
2019-10-29Merge "Remove /var/yum/cache from CentOS base image"Zuul1-5/+2
2019-10-29base: use en_US.UTF-8 locale on all distrosMarcin Juszkiewicz1-1/+1
C.UTF-8 is not supported in RHEL 7: https://bugzilla.redhat.com/show_bug.cgi?id=1361965 Closes-bug: #1850035 Change-Id: I20dcb86e7e119b9f5ca44cd066fcb9cb84af1ce4
2019-10-28Change ODL repo to nexus.opendaylight.orgMichal Nasiadka1-3/+2
Change-Id: I242945edba84b891ccbf82d5fcce8ef5fe37ad3d
2019-10-28Remove /var/yum/cache from CentOS base imageMark Goddard1-5/+2
Since https://review.opendev.org/#/c/682600/, the following lines result in /var/yum/cache being present in one of the layers of the base image: RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }} \ {% for repo in base_centos_yum_repos_to_disable | customizable('centos_yum_repos_to_disable') -%} && yum-config-manager --disable {{ repo }} \ {% endfor -%} {% for key in base_centos_yum_repo_keys | customizable('centos_yum_repo_keys') -%} && rpm --import {{ key }} \ {% endfor -%} && /bin/true {% block base_centos_repo_overrides_post_yum %}{% endblock %} RUN {{ macros.rpm_security_update(clean_package_cache) }} This is because it is not cleaned in the first RUN statement. This adds 76MB to the image. Also, using two separate RUNs which results in an extra 23MB due to updates to /var/lib/rpm/Packages. Found via https://github.com/wagoodman/dive. Change-Id: I0302ee1dfc10a2b7df127ac6a7764a84b1d74a33 Closes-Bug: #1850036
2019-10-28Fix centos qdrouterd - use RDO qpid packages onlyRadosław Piliszek1-0/+3
Disables other sources with qpid packages. Change-Id: I508b8258e0d0aacfa0e4ff56706b5f273d2fbf0a Closes-bug: #1850044
2019-10-26Merge "Move to RDO Train packages"Zuul2-1/+3
2019-10-25Set pipefail in kolla_mariadb_backup.shMark Goddard1-0/+1
Without this, a failure in mariabackup would be ignored due to the pipe to gzip. Change-Id: I84536b302991e8fb04d5fa67ea266bc428437ce1 Related-Bug: #1843043
2019-10-24Merge "get 'apt_*' options of kolla-build.conf working again"Zuul3-0/+4
2019-10-24Merge "ovn: Create the ovn dbs only if the schema file exists"Zuul2-4/+30
2019-10-24Merge "Fix mariabackup arguments"Zuul1-11/+10
2019-10-24ovn: Create the ovn dbs only if the schema file existsNuman Siddique2-4/+30
OVN has been split out from openvswitch and it's code is here [1]. With the split we have changed the ovn runtime/data dirs to /etc/ovn and /usr/share/ovn respectively. If a user uses latest OVN (when used after the split from openvswitch), then the extend_start.sh of ovn-nb-db-server and ovn-sb-db-server will fail because the OVN schema files will be in different location (new location is /usr/share/ovn/ovn-nb.ovschema and /usr/share/ovn/ovn-sb.ovschema) The old location is - /usr/share/openvswitch/ovn-nb.ovschema and /usr/share/openvswitch/ovn-sb.ovschema This patch checks for the presence of the schema files in the old location before accessing them. For latest OVN, it is advisable to use the "ovn-ctl" script to start and stop OVN ovsdb-servers. ovn-citl script takes care of creating the dbs and updating the dbs if the schema is updated. [1] - https://github.com/ovn-org/ovn https://github.com/openvswitch/ovs/commit/f3e24610ea18eb873dc860f1710432e9aacd27fd Change-Id: If2bab2fac5be28ae7e1cd02de13a2de94fe17bac Closes-bug: 1849633 Signed-off-by: Numan Siddique <nusiddiq@redhat.com>
2019-10-23Fix mariabackup argumentsMark Goddard1-11/+10
After switching from innobackupex to mariabackup [1] for database backups, the kolla_mariadb_backup.sh script was not modified to account for the difference in arguments between innobackupex and mariabackup. There is a compatibility mode, the documentation [2] for which covers some of the differences. The following have been changed: - Add explicit --backup argument, now required - Remove './' positional argument - not required with --stream - Remove --no-timestamp argument - only supported in innobackupex compatibility mode - Remove --incremental argument - implied by --incremental-history-name - Remove deprecated --compress argument, which requires qpress to be installed (it is not). The stream is now passed through gzip instead [3] [1] https://mariadb.com/kb/en/library/mariabackup-overview/ [2] https://mariadb.com/kb/en/library/mariabackup-options/#-innobackupex [3] https://mariadb.com/kb/en/library/using-encryption-and-compression-tools-with-mariabackup/ Change-Id: I67cff47cbf56570b8eaeb66092dd87c2769fc8a6 Closes-Bug: #1843043
2019-10-23base: drop not used apt preferences for UbuntuMarcin Juszkiewicz1-4/+0
We used APT preferences to limit Ubuntu to Ceph 'mimic' (13.x) but those packages are no longer present so we got Ceph 'nautilus' (14.x) in our images. So let's drop not used settings. Change-Id: I51da99efedc0b11c8ff529475f7878e6d9f5e63f
2019-10-22Merge "Switch upper constraints in kolla-toolbox to use releases.o.o"Zuul1-1/+1
2019-10-21Fix python3 compatibility for barbicanDincer Celik2-2/+2
Barbican refers to python3 but uwsgi refers to python2. This change fixes this issue. Change-Id: I508bb082a319955b3e008235e158eaa07a1e8a74 Closes-Bug: #1849128
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-10-21Move to RDO Train packagesMichal Nasiadka2-1/+3
Change-Id: I396f929ecc11f87fb83585bedd39be93a605c57b
2019-10-21Merge "Bump Openstack Exporter version to 0.6.0"Zuul1-1/+1
2019-10-18Merge "Fix fetch_ceph_keys to run in python3"Zuul1-1/+1
2019-10-18Bump Openstack Exporter version to 0.6.0Keith Plant1-1/+1
There appears to be a bug in the prometheus openstack exporter versions <= 0.2.1 causing cinder data to stop being collected after about 24 hours. Bumping to latest stable version 0.6.0. Change-Id: Iccaf4c0bb79e7e33072e37aa83711b37938d6719 Signed-off-by: Keith Plant <kplantjr@gmail.com>
2019-10-17get 'apt_*' options of kolla-build.conf working againMarcin Juszkiewicz3-0/+4
We broke 'apt_sources_list' and 'apt_preferences' options quite a while ago. Turned out that fix is quite simple. This change adds empty sources.list and apt-preferences files which are always added into images. If kolla-build.conf will use any of APT related options then those files will be replaced with provided ones. Change-Id: I7bbdcbd5c60f654a484a872209e0537e3950346c Closes-bug: #1706549
2019-10-17Fix fetch_ceph_keys to run in python3Michal Nasiadka1-1/+1
Quick fix to convert bytes object to string, that can be serialized by JSON. Change-Id: I7d3db8e43eccc06aaf21e84990317133fa515a1f
2019-10-16Merge "Neutron: add support to use legacy iptables"Zuul2-0/+15
2019-10-16Merge "Add disk dev name check function"Zuul1-39/+20
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-05 23:21:26 +0000