Use the new image naming scheme by default

Adds a relevant reno to inform users about the change and the
possibility to customise the prefix.

Additionally, this patch includes the fix to Ubuntu image builds
regarding rabbitmq and erlang.

Both the changes are required to fix master CI.

Change-Id: I6bc8b489a810849744c8bead6b9e350c5d3e36b7
Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/843752

7 files changed, 31 insertions, 22 deletions

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index cf17be0f6..290e64b65 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -313,8 +313,8 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
 ] %}
 
 {% set base_apt_keys = [
-   {'name': 'erlang',   'keyid': 'F77F1EDA57EBB1CC'},
-   {'name': 'rabbitmq', 'keyid': 'F6609E60DC62814E'},
+   {'name': 'erlang',   'keyid': 'E495BB49CC4BBE5B'},
+   {'name': 'rabbitmq', 'keyid': '9F4587F226208342'},
    {'name': 'haproxy',  'keyid': 'CFFB779AADC995E4F350A060505D97A41C61B9CD'},
 ] %}
 
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"
diff --git a/releasenotes/notes/new-naming-scheme-45a5669053c9328d.yaml b/releasenotes/notes/new-naming-scheme-45a5669053c9328d.yaml
new file mode 100644
index 000000000..ea9abea6a
--- /dev/null
+++ b/releasenotes/notes/new-naming-scheme-45a5669053c9328d.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    Kolla Build no longer prepends the base (distro) name to image names.
+    Instead, the user is able to choose any prefix they wish via the
+    ``image_name_prefix`` setting.
diff --git a/releasenotes/notes/rabbitmq-erlang-cloudsmith-c837bf4a450dd802.yaml b/releasenotes/notes/rabbitmq-erlang-cloudsmith-c837bf4a450dd802.yaml
new file mode 100644
index 000000000..b87bf9763
--- /dev/null
+++ b/releasenotes/notes/rabbitmq-erlang-cloudsmith-c837bf4a450dd802.yaml
@@ -0,0 +1,10 @@
+---
+fixes:
+  - |
+    Fixes the Debian and Ubuntu images to use rabbitmq and erlang from
+    cloudsmith so that the images are still buildable and use proper versions.
+upgrade:
+  - |
+    The Debian and Ubuntu images use rabbitmq and erlang from cloudsmith now.
+    Operators might want to mirror/proxy this new source as it provides the
+    correct set of packages unlike the previous combination.
diff --git a/tests/playbooks/run.yml b/tests/playbooks/run.yml
index effe1df18..5a5063361 100644
--- a/tests/playbooks/run.yml
+++ b/tests/playbooks/run.yml
@@ -28,7 +28,6 @@
           DEFAULT:
             namespace: "{{ kolla_namespace }}"
             tag: "{{ zuul.branch | basename }}-{{ base_distro }}-{{ base_distro_version }}{{ tag_suffix }}"
-            use_new_naming_scheme: true
       set_fact:
         kolla_build_config: "{{ kolla_build_config | combine(kolla_publisher_config, recursive=True) }}"
       when: