diff options
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/common/config.py | 5 | ||||
| -rwxr-xr-x | kolla/image/build.py | 5 | ||||
| -rw-r--r-- | kolla/template/repos.yaml | 22 |
3 files changed, 13 insertions, 19 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index faad3576f..1cfdebdd3 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -249,9 +249,8 @@ _CLI_OPTS = [ help='Enable images marked as unbuildable'), cfg.BoolOpt('summary', default=True, help='Show summary at the end of build'), - cfg.BoolOpt('use-new-naming-scheme', default=False, - help='Use the new naming scheme (transitional option, ' - 'not to be set by end users)'), + cfg.StrOpt('image-name-prefix', default='', + help='Prefix prepended to image names'), ] _BASE_OPTS = [ diff --git a/kolla/image/build.py b/kolla/image/build.py index f02c6e231..0808afc84 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -650,10 +650,7 @@ class KollaWorker(object): self.clean_package_cache = self.conf.clean_package_cache - if self.conf.use_new_naming_scheme: - self.image_prefix = '' - else: - self.image_prefix = self.base + '-' + self.image_prefix = self.conf.image_name_prefix self.regex = conf.regex self.image_statuses_bad = dict() diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index 51179742e..270eec2b3 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -47,9 +47,8 @@ debian: component: "main" gpg_key: "elasticsearch.asc" erlang: - # NOTE(mnasiadka): Erlang repo - Debian Buster/Bullseye needs to use bionic as per RabbitMQ docs - url: "http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu" - suite: "bionic" + url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/debian" + suite: "bullseye" component: "main" gpg_key: "erlang.gpg" grafana: @@ -78,7 +77,7 @@ debian: component: "main" gpg_key: "mariadb.gpg" rabbitmq: - url: "https://packagecloud.io/rabbitmq/rabbitmq-server/debian/" + url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/debian" suite: "bullseye" component: "main" gpg_key: "rabbitmq.gpg" @@ -100,9 +99,8 @@ debian-aarch64: component: "main" gpg_key: "elasticsearch.asc" erlang: - # NOTE(mnasiadka): Erlang repo - Debian Buster/Bullseye needs to use bionic as per RabbitMQ docs - url: "http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu" - suite: "bionic" + url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/debian" + suite: "bullseye" component: "main" gpg_key: "erlang.gpg" grafana: @@ -131,7 +129,7 @@ debian-aarch64: component: "main" gpg_key: "mariadb.gpg" rabbitmq: - url: "https://packagecloud.io/rabbitmq/rabbitmq-server/debian/" + url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/debian" suite: "bullseye" component: "main" gpg_key: "rabbitmq.gpg" @@ -153,7 +151,7 @@ ubuntu: component: "main" gpg_key: "elasticsearch.asc" erlang: - url: "http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu" + url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/ubuntu" suite: "focal" component: "main" gpg_key: "erlang.gpg" @@ -188,7 +186,7 @@ ubuntu: component: "main" gpg_key: "mariadb.gpg" rabbitmq: - url: "https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/" + url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/ubuntu" suite: "focal" component: "main" gpg_key: "rabbitmq.gpg" @@ -210,7 +208,7 @@ ubuntu-aarch64: component: "main" gpg_key: "elasticsearch.asc" erlang: - url: "http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu" + url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/ubuntu" suite: "focal" component: "main" gpg_key: "erlang.gpg" @@ -240,7 +238,7 @@ ubuntu-aarch64: component: "main" gpg_key: "mariadb.gpg" rabbitmq: - url: "https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/" + url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/ubuntu" suite: "focal" component: "main" gpg_key: "rabbitmq.gpg" |