yoga xena merge

etc/kayobe/ansible/cephadm-gather-keys.yml

@@ -25,6 +25,7 @@
     - name: Get Ceph keys
       stackhpc.cephadm.cephadm_key:
         name: "{{ item }}"
+        output_format: plain
         state: info
       register: cephadm_key_info
       become: true
@@ -49,10 +50,12 @@
     - name: Save Ceph keys to Kayobe configuration
       vars:
         key_info: "{{ cephadm_key_info.results | selectattr('item', 'equalto', item.1) | first }}"
-        cephadm_key: "{{ (key_info.stdout | from_json | first)['key'] }}"
-        cephadm_user: "{{ (key_info.stdout | from_json | first)['entity'] }}"
+        cephadm_key: "{{ key_info.stdout }}"
+        cephadm_user: "{{ item.1 }}"
       copy:
-        content: "{{ cephadm_key }}"
+        # Include a trailing newline.
+        content: |
+          {{ cephadm_key }}
         dest: "{{ kayobe_env_config_path }}/kolla/config/{{ kolla_service_to_key_dir[item.0.name] }}/ceph.{{ cephadm_user }}.keyring"
       loop: "{{ query('subelements', kolla_ceph_services | selectattr('required'), 'keys') }}"
       loop_control:
@@ -64,7 +67,10 @@
 
     - name: Save ceph.conf to Kayobe configuration
       copy:
-        content: "{{ cephadm_ceph_conf.stdout }}"
+        # Include a trailing newline.
+        # Kolla Ansible's merge_configs module does not like the leading tabs in ceph.conf.
+        content: |
+          {{ cephadm_ceph_conf.stdout | regex_replace('\t') }}
         dest: "{{ kayobe_env_config_path }}/kolla/config/{{ kolla_service_to_conf_dir[item.0.name] }}/ceph.conf"
       loop: "{{ query('subelements', kolla_ceph_services | selectattr('required'), 'keys') }}"
       loop_control:

etc/kayobe/ansible/rsyslog.yml

@@ -0,0 +1,36 @@
+---
+# Custom playbook to configure rsyslog to forward operating system logs to
+# fluentd, eventually reaching Kolla's Elasticsearch cluster.
+#
+# Variables:
+# * rsyslog_group: Host pattern against which to target the playbook. Default
+#   is 'overcloud'.
+
+- name: Configure rsyslog to forward messages
+  hosts: "{{ rsyslog_group | default('overcloud') }}"
+  become: yes
+
+  tasks:
+  - name: Ensure rsyslog is installed
+    package:
+      name: rsyslog
+      state: present
+
+  - name: Ensure rsyslog is started and enabled
+    systemd:
+      state: started
+      enabled: yes
+      name: rsyslog
+
+  - name: Update rsyslog configuration
+    lineinfile:
+      path: /etc/rsyslog.conf
+      insertafter: "^#*.* @@remote-host:514"
+      line: "*.* @{{ internal_net_name | net_ip }}:5140"
+    register: rsyslog_config
+
+  - name: Restart rsyslog
+    systemd:
+      state: restarted
+      name: rsyslog
+    when: rsyslog_config.changed

etc/kayobe/cephadm.yml

@@ -23,6 +23,9 @@ cephadm_registry_username: "{{ stackhpc_docker_registry_username }}"
 # Ceph container image registry password.
 cephadm_registry_password: "{{ stackhpc_docker_registry_password }}"
 
+# Cephadm admin network interface.
+cephadm_admin_interface: "{{ admin_oc_net_name | net_interface }}"
+
 # Ceph public network interface.
 cephadm_public_interface: "{{ storage_net_name | net_interface }}"
 

etc/kayobe/kolla/globals.yml

@@ -1,7 +1,7 @@
 # yamllint disable-file
 ---
 docker_yum_baseurl: "{{ stackhpc_repo_docker_url }}"
-docker_yum_gpgkey: "https://download.docker.com/linux/{% raw %}{{ ansible_facts.distribution | lower }}{% endraw %}/gpg"
+docker_yum_gpgkey: "https://download.docker.com/linux/centos/gpg"
 
 {% if kolla_base_distro == 'centos' %}
 bifrost_tag: yoga-20220831T122627

etc/kayobe/pulp-repo-versions.yml

@@ -20,6 +20,11 @@ stackhpc_pulp_repo_mariadb_10_6_centos8_version: 20220819T111114
 stackhpc_pulp_repo_rabbitmq_erlang_version: 20220828T050510
 stackhpc_pulp_repo_rabbitmq_server_version: 20220803T043053
 stackhpc_pulp_repo_treasuredata_4_version: 20220823T042339
-stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20220830T054227
-stackhpc_pulp_repo_ubuntu_focal_security_version: 20220830T054227
-stackhpc_pulp_repo_ubuntu_focal_version: 20220830T054227
+stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20220804T040153
+stackhpc_pulp_repo_ubuntu_focal_security_version: 20220804T040153
+stackhpc_pulp_repo_ubuntu_focal_version: 20220804T040153
+stackhpc_pulp_repo_rocky_8_6_appstream_version: "20220606T111205"
+stackhpc_pulp_repo_rocky_8_6_baseos_version: "20220606T111205"
+stackhpc_pulp_repo_rocky_8_6_extras_version: "20220606T111205"
+stackhpc_pulp_repo_rocky_8_6_nfv_version: "20220606T111205"
+stackhpc_pulp_repo_rocky_8_6_powertools_version: "20220606T111205"