Re-add Zuul testing to the project

Zuul configuration file has been dropped from the project [1] during
import to opendev as a pre-requisite.

We re-add it now to be able to merge changes to the role.

[1] https://github.com/jrosser/openstack-ansible-os_skyline/pull/2

Change-Id: I0f5a4de5d273014951e48b82703a042e74118ab1

defaults/main.yml

@@ -25,7 +25,11 @@ skyline_package_state: "{{ package_state | default('latest') }}"
 # for the service setup. The host must already have
 # clouds.yaml properly configured.
 skyline_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}"
-skyline_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((skyline_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_facts['python']['executable'])) }}"
+skyline_service_setup_host_python_interpreter: >-
+  {{
+     openstack_service_setup_host_python_interpreter | default(
+       (skyline_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_facts['python']['executable']))
+  }}
 
 skyline_git_repo: https://opendev.org/openstack/skyline-apiserver
 skyline_git_install_branch: master
@@ -33,7 +37,8 @@ skyline_git_install_branch: master
 skyline_console_git_repo: https://opendev.org/openstack/skyline-console
 skyline_console_git_install_branch: master
 
-skyline_upper_constraints_url: "{{ requirements_git_url | default('https://releases.openstack.org/constraints/upper/' ~ requirements_git_install_branch | default('master')) }}"
+skyline_upper_constraints_url: >-
+  {{ requirements_git_url | default('https://releases.openstack.org/constraints/upper/' ~ requirements_git_install_branch | default('master')) }}
 skyline_git_constraints: []
 #  - "--constraint {{ skyline_upper_constraints_url }}"
 
@@ -46,7 +51,11 @@ skyline_lib_static_files: "{{ skyline_lib_dir }}/skyline_console/static"
 
 ## Database info
 skyline_db_setup_host: "{{ openstack_db_setup_host | default('localhost') }}"
-skyline_db_setup_python_interpreter: "{{ openstack_db_setup_python_interpreter | default((skyline_db_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_facts['python']['executable'])) }}"
+skyline_db_setup_python_interpreter: >-
+  {{
+     openstack_db_setup_python_interpreter | default(
+       (skyline_db_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_facts['python']['executable']))
+  }}
 skyline_galera_address: "{{ galera_address | default('127.0.0.1') }}"
 skyline_galera_database: skyline
 skyline_galera_user: skyline

doc/source/conf.py

@@ -76,7 +76,7 @@ openstackdocs_bug_tag = ''
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = None
+# language = None
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:

handlers/main.yml

@@ -52,7 +52,3 @@
     daemon_reload: "{{ (ansible_facts['service_mgr'] == 'systemd') | ternary('yes', omit) }}"
   listen:
     - "venv changed"
-
-- meta: noop
-  listen: Manage LB
-  when: false

meta/main.yml

@@ -18,19 +18,20 @@ galaxy_info:
   description: Installation and setup of skyline
   company: BBC R&D
   license: Apache2
-  min_ansible_version: 2.4
+  min_ansible_version: "2.10"
+  role_name: os_skyline
+  namespace: openstack
   platforms:
     - name: Debian
       versions:
-        - buster
+        - bookworm
     - name: Ubuntu
       versions:
-        - bionic
-        - focal
+        - jammy
     - name: EL
       versions:
-        - 8
-  categories:
+        - 9
+  galaxy_tags:
     - cloud
     - python
     - skyline

releasenotes/source/index.rst

@@ -6,6 +6,3 @@
    :maxdepth: 1
 
    unreleased
-   ussuri
-   train
-   stein

releasenotes/source/stein.rst

@@ -1,6 +0,0 @@
-===================================
- Stein Series Release Notes
-===================================
-
-.. release-notes::
-   :branch: stable/stein

releasenotes/source/train.rst

@@ -1,6 +0,0 @@
-==========================
-Train Series Release Notes
-==========================
-
-.. release-notes::
-   :branch: stable/train

releasenotes/source/ussuri.rst

@@ -1,6 +0,0 @@
-===========================
-Ussuri Series Release Notes
-===========================
-
-.. release-notes::
-   :branch: stable/ussuri

tasks/main.yml

@@ -29,7 +29,8 @@
   tags:
     - always
 
-- include_role:
+- name: Including osa.db_setup role
+  include_role:
     name: openstack.osa.db_setup
     apply:
       tags:
@@ -50,24 +51,29 @@
   tags:
     - always
 
-- import_tasks: skyline_pre_install.yml
+- name: Importing skyline_pre_install tasks
+  import_tasks: skyline_pre_install.yml
   tags:
     - skyline-install
 
-- import_tasks: skyline_install.yml
+- name: Importing skyline_install tasks
+  import_tasks: skyline_install.yml
   tags:
     - skyline-install
 
-- import_tasks: skyline_post_install.yml
+- name: Importing skyline_post_install tasks
+  import_tasks: skyline_post_install.yml
   tags:
     - skyline-config
 
-- import_tasks: skyline_db_sync.yml
+- name: Importing skyline_db_sync tasks
+  import_tasks: skyline_db_sync.yml
   when: _skyline_is_first_play_host
   tags:
     - skyline-config
 
-- include_role:
+- name: Including openstack.osa.service_setup role
+  include_role:
     name: openstack.osa.service_setup
     apply:
       tags:

tasks/skyline_install.yml

@@ -53,10 +53,10 @@
     systemd_tempd_prefix: openstack
     systemd_slice_name: skyline
     systemd_lock_path: /var/lock/skyline
-    systemd_CPUAccounting: true
-    systemd_BlockIOAccounting: true
-    systemd_MemoryAccounting: true
-    systemd_TasksAccounting: true
+    systemd_service_cpu_accounting: true
+    systemd_service_block_io_accounting: true
+    systemd_service_memory_accounting: true
+    systemd_service_tasks_accounting: true
     systemd_services:
       - service_name: "{{ service_var.service_name }}"
         enabled: yes

tasks/skyline_post_install.yml

@@ -31,7 +31,7 @@
     src: "gunicorn.py.j2"
     dest: "/etc/skyline/gunicorn.py"
     owner: "root"
-    group: "{{ item.group|default(skyline_system_group_name) }}"
+    group: "{{ item.group | default(skyline_system_group_name) }}"
     mode: "0640"
   notify:
     - Restart skyline services
@@ -41,7 +41,7 @@
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
     owner: "root"
-    group: "{{ item.group|default(skyline_system_group_name) }}"
+    group: "{{ item.group | default(skyline_system_group_name) }}"
     mode: "0640"
     config_overrides: "{{ item.config_overrides }}"
     config_type: "{{ item.config_type }}"
@@ -58,6 +58,8 @@
     openstack --os-cloud default endpoint list --format yaml --interface {{ skyline_interface }}
   delegate_to: "{{ skyline_service_setup_host }}"
   register: _endpoint_list
+  run_once: true
+  changed_when: false
 
 - name: Set endpoint fact
   set_fact:

tasks/skyline_pre_install.yml

@@ -13,17 +13,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: create the system group
+- name: Create the system group
   group:
     name: "{{ skyline_system_group_name }}"
-    gid: "{{ skyline_system_group_gid|default(omit) }}"
+    gid: "{{ skyline_system_group_gid | default(omit) }}"
     state: "present"
     system: "yes"
 
 - name: Create the skyline system user
   user:
     name: "{{ skyline_system_user_name }}"
-    uid: "{{ skyline_system_user_uid|default(omit) }}"
+    uid: "{{ skyline_system_user_uid | default(omit) }}"
     group: "{{ skyline_system_group_name }}"
     comment: "{{ skyline_system_comment }}"
     shell: "{{ skyline_system_shell }}"
@@ -35,9 +35,9 @@
   file:
     path: "{{ item.path }}"
     state: directory
-    owner: "{{ item.owner|default(skyline_system_user_name) }}"
-    group: "{{ item.group|default(skyline_system_group_name) }}"
-    mode: "{{ item.mode|default('0755') }}"
+    owner: "{{ item.owner | default(skyline_system_user_name) }}"
+    group: "{{ item.group | default(skyline_system_group_name) }}"
+    mode: "{{ item.mode | default('0755') }}"
   loop:
     - path: "/openstack"
       mode: "0755"

vars/main.yml

@@ -13,8 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-_skyline_is_first_play_host: "{{ (skyline_services['skyline-api']['group'] in group_names and inventory_hostname == (groups[skyline_services['skyline-api']['group']] | intersect(ansible_play_hosts)) | first) | bool }}"
-
+_skyline_is_first_play_host: >-
+  {{
+    (skyline_services['skyline-api']['group'] in group_names and inventory_hostname == (
+      groups[skyline_services['skyline-api']['group']] | intersect(ansible_play_hosts)) | first) | bool
+  }}
 
 skyline_package_list: |-
   {% set packages = skyline_distro_packages %}

zuul.d/project.yaml

@@ -0,0 +1,22 @@
+---
+# Copyright 2022, BBC R&D
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+- project:
+    templates:
+      - check-requirements
+      - openstack-ansible-linters-jobs
+      - openstack-ansible-deploy-aio_metal-jobs
+      - publish-openstack-docs-pti
+      - build-release-notes-jobs-python3