diff options
| author | Zuul <zuul@review.opendev.org> | 2021-11-22 09:57:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-11-22 09:57:07 +0000 |
| commit | bc4c654e9be983c89bf8986863f39769ef36e7c2 (patch) | |
| tree | 96f14e19f4a45d1eb052c01f204afe0dc334d9a3 | |
| parent | 88e6bcf38a5957fd40ea3f912e28c4ce546df278 (diff) | |
| parent | b8b181a0603ce799fa447c713afb0dfedfc3592a (diff) | |
| download | kolla-bc4c654e9be983c89bf8986863f39769ef36e7c2.tar.gz kolla-bc4c654e9be983c89bf8986863f39769ef36e7c2.zip | |
Merge "Use MariaDB 10.6"
| -rw-r--r-- | docker/base/mariadb-aarch64.repo | 2 | ||||
| -rw-r--r-- | docker/base/mariadb.repo | 2 | ||||
| -rw-r--r-- | kolla/template/repos.yaml | 8 | ||||
| -rw-r--r-- | releasenotes/notes/mariadb-10.6-c79b0ad5791256ad.yaml | 4 |
4 files changed, 10 insertions, 6 deletions
diff --git a/docker/base/mariadb-aarch64.repo b/docker/base/mariadb-aarch64.repo index 7f7a1c8b1..b00cbbde0 100644 --- a/docker/base/mariadb-aarch64.repo +++ b/docker/base/mariadb-aarch64.repo @@ -1,6 +1,6 @@ [mariadb] name = MariaDB -baseurl = https://downloads.mariadb.com/MariaDB/mariadb-10.5/yum/centos8-aarch64 +baseurl = https://downloads.mariadb.com/MariaDB/mariadb-10.6/yum/centos8-aarch64 module_hotfixes = 1 gpgcheck = 1 enabled = 0 diff --git a/docker/base/mariadb.repo b/docker/base/mariadb.repo index 9fbdd12ee..be96b44ae 100644 --- a/docker/base/mariadb.repo +++ b/docker/base/mariadb.repo @@ -1,6 +1,6 @@ [mariadb] name = MariaDB -baseurl = https://downloads.mariadb.com/MariaDB/mariadb-10.5/yum/centos8-amd64 +baseurl = https://downloads.mariadb.com/MariaDB/mariadb-10.6/yum/centos8-amd64 module_hotfixes = 1 gpgcheck = 1 enabled = 0 diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index 465139e2f..d66df8241 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -75,7 +75,7 @@ debian: component: "main" gpg_key: "elasticsearch.asc" mariadb: - url: "http://downloads.mariadb.com/MariaDB/mariadb-10.5/repo/debian" + url: "http://downloads.mariadb.com/MariaDB/mariadb-10.6/repo/debian" suite: "bullseye" component: "main" gpg_key: "mariadb.gpg" @@ -128,7 +128,7 @@ debian-aarch64: component: "main" gpg_key: "elasticsearch.asc" mariadb: - url: "http://downloads.mariadb.com/MariaDB/mariadb-10.5/repo/debian" + url: "http://downloads.mariadb.com/MariaDB/mariadb-10.6/repo/debian" suite: "bullseye" component: "main" gpg_key: "mariadb.gpg" @@ -185,7 +185,7 @@ ubuntu: component: "main" gpg_key: "elasticsearch.asc" mariadb: - url: "http://downloads.mariadb.com/MariaDB/mariadb-10.5/repo/ubuntu" + url: "http://downloads.mariadb.com/MariaDB/mariadb-10.6/repo/ubuntu" suite: "focal" component: "main" gpg_key: "mariadb.gpg" @@ -237,7 +237,7 @@ ubuntu-aarch64: component: "main" gpg_key: "elasticsearch.asc" mariadb: - url: "http://downloads.mariadb.com/MariaDB/mariadb-10.5/repo/ubuntu" + url: "http://downloads.mariadb.com/MariaDB/mariadb-10.6/repo/ubuntu" suite: "focal" component: "main" gpg_key: "mariadb.gpg" diff --git a/releasenotes/notes/mariadb-10.6-c79b0ad5791256ad.yaml b/releasenotes/notes/mariadb-10.6-c79b0ad5791256ad.yaml new file mode 100644 index 000000000..99602f1b7 --- /dev/null +++ b/releasenotes/notes/mariadb-10.6-c79b0ad5791256ad.yaml @@ -0,0 +1,4 @@ +--- +other: + - | + Images now have MariaDB 10.6. |