diff options
| author | Zuul <zuul@review.opendev.org> | 2022-08-24 17:08:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-08-24 17:08:15 +0000 |
| commit | ba747e92b9f9781e5123e29db133d0f41496b62c (patch) | |
| tree | 2737620c17cb81d6e29ee9e9fdb51b00d639273c | |
| parent | 37bab095b6650c9787a1fcc473ae907f08c5d124 (diff) | |
| parent | c1437c8ba2a48aafe27ddfb7511352ae61ba8f31 (diff) | |
| download | kolla-ba747e92b9f9781e5123e29db133d0f41496b62c.tar.gz kolla-ba747e92b9f9781e5123e29db133d0f41496b62c.zip | |
Merge "Add Ubuntu Jammy MariaDB repository"
| -rw-r--r-- | docker/base/apt_preferences.ubuntu | 4 | ||||
| -rw-r--r-- | kolla/template/repos.yaml | 10 |
2 files changed, 14 insertions, 0 deletions
diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu index 76334e51b..09a89ee44 100644 --- a/docker/base/apt_preferences.ubuntu +++ b/docker/base/apt_preferences.ubuntu @@ -11,3 +11,7 @@ Pin-Priority: 1000 Package: logstash-oss Pin: version 7.9.* Pin-Priority: 1000 + +Package: * +Pin: origin dlm.mariadb.com +Pin-Priority: 1000 diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index 23ff94547..68f53c826 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -175,6 +175,11 @@ ubuntu: suite: "stable" component: "main" gpg_key: "elasticsearch.asc" + mariadb: + url: "https://dlm.mariadb.com/repo/mariadb-server/10.6/repo/ubuntu" + suite: "jammy" + component: "main" + gpg_key: "mariadb.gpg" rabbitmq: url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/ubuntu" suite: "jammy" @@ -217,6 +222,11 @@ ubuntu-aarch64: suite: "stable" component: "main" gpg_key: "elasticsearch.asc" + mariadb: + url: "https://dlm.mariadb.com/repo/mariadb-server/10.6/repo/ubuntu" + suite: "jammy" + component: "main" + gpg_key: "mariadb.gpg" rabbitmq: url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/ubuntu" suite: "jammy" |