Merge pull request #103 from stackhpc/xena-images

Add initial Xena container image configuration & tags

Author: markgoddard

etc/kayobe/kolla.yml

@@ -96,7 +96,7 @@ kolla_docker_registry_password: "{{ stackhpc_docker_registry_password }}"
 
 # Kolla OpenStack release version. This should be a Docker image tag.
 # Default is {{ openstack_release }}.
-kolla_openstack_release: TODO
+kolla_openstack_release: xena-20220728T100435
 
 # Docker tag applied to built container images. Default is
 # {{ kolla_openstack_release }}.
@@ -111,10 +111,6 @@ kolla_openstack_release: TODO
 #     location: https://github.com/openstack/ironic
 #     reference: master
 kolla_sources:
-  barbican-base:
-    type: git
-    location: "https://github.com/stackhpc/barbican.git"
-    reference: stackhpc/xena
   bifrost-base:
     type: git
     location: "{{ kolla_bifrost_source_url }}"
@@ -198,7 +194,7 @@ stackhpc_ubuntu_focal_repos:
   - "deb {{ stackhpc_repo_ubuntu_focal_url }} focal-updates main universe"
   - "deb {{ stackhpc_repo_ubuntu_focal_url }} focal-backports main universe"
   - "deb {{ stackhpc_repo_ubuntu_focal_security_url }} focal-security main universe"
-  - "deb {{ stackhpc_repo_ubuntu_cloud_archive_url }} focal-updates/wallaby main"
+  - "deb {{ stackhpc_repo_ubuntu_cloud_archive_url }} focal-updates/{{ openstack_release }} main"
 
 # Dict mapping Jinja2 block names in kolla's Docker images to their contents.
 kolla_build_blocks:
@@ -231,23 +227,6 @@ kolla_build_blocks:
     RUN grafana-cli plugins install vonage-status-panel
   ironic_inspector_header: |
     ADD additions-archive /
-  prometheus_v2_server_repository_version: |
-    ARG prometheus_version='2.35.0'
-  prometheus_alertmanager_repository_version: |
-    ARG prometheus_alertmanager_version='0.24.0'
-  prometheus_cadvisor_repository_version: |
-    ARG prometheus_cadvisor_version='0.40.0'
-    ARG prometheus_cadvisor_sha256sum='8e3df91eee70c72ac3f3184b9fab1229b037c2e850ff1593103b2bd9028c57c0'
-  node_exporter_repository_version: |
-    ARG node_exporter_version='1.3.1'
-  prometheus_memcached_exporter_repository_version: |
-    ARG memcached_exporter_version='0.9.0'
-  haproxy_exporter_repository_version: |
-    ARG haproxy_exporter_version='0.13.0'
-  mysqld_exporter_repository_version: |
-    ARG mysqld_exporter_version='0.13.0'
-  prometheus_blackbox_exporter_repository_version: |
-    ARG blackbox_exporter_version='0.19.0'
 
 # Dict mapping image customization variable names to their values.
 # Each variable takes the form:
@@ -290,6 +269,18 @@ kolla_build_customizations_ubuntu: {}
 # override, append or remove. The value should be a list.
 kolla_build_customizations: "{{ kolla_build_customizations_common | combine(kolla_build_customizations_centos if kolla_base_distro == 'centos' else kolla_build_customizations_ubuntu) }}"
 
+# Dict mapping Kolla Dockerfile ARG names to their values.
+kolla_build_args:
+  blackbox_exporter_version: "0.19.0"
+  haproxy_exporter_version: "0.13.0"
+  memcached_exporter_version: "0.9.0"
+  mysqld_exporter_version: "0.13.0"
+  node_exporter_version: "1.3.1"
+  prometheus_version: "2.35.0"
+  prometheus_alertmanager_version: "0.24.0"
+  prometheus_cadvisor_sha256sum: "8e3df91eee70c72ac3f3184b9fab1229b037c2e850ff1593103b2bd9028c57c0"
+  prometheus_cadvisor_version: "0.40.0"
+
 ###############################################################################
 # Kolla-ansible inventory configuration.
 

etc/kayobe/kolla/globals.yml

@@ -4,3 +4,6 @@ enable_docker_repo: "{% raw %}{{ ansible_facts.os_family == 'RedHat' }}{% endraw
 
 docker_yum_baseurl: "{{ stackhpc_repo_docker_url }}"
 docker_yum_gpgkey: "https://download.docker.com/linux/{% raw %}{{ ansible_facts.distribution | lower }}{% endraw %}/gpg"
+
+barbican_tag: xena-20220728T143658
+prometheus_tag: xena-20220728T143658

etc/kayobe/kolla/kolla-build.conf

@@ -0,0 +1,2 @@
+[DEFAULT]
+build_args = {{ kolla_build_args.items() | map('join', ':') | join(',') }}

etc/kayobe/pulp.yml

@@ -68,7 +68,7 @@ stackhpc_pulp_repository_deb_repos:
     policy: on_demand
     architectures: amd64
     components: main
-    distributions: focal-updates/wallaby
+    distributions: "focal-updates/{{ openstack_release }}"
     mirror: true
     state: present
     required: "{{ stackhpc_pulp_sync_ubuntu_focal | bool }}"