Merge pull request #505 from stackhpc/yoga-xena-merge

yoga: xena merge

Author: markgoddard

doc/source/contributor/environments/ci-multinode.rst

@@ -242,7 +242,7 @@ Create a cluster:
 
 .. code-block:: bash
 
-      openstack coe cluster create --keypair id_rsa --master-count 1 --node-count 1 --floating-ip-enabled test-cluster
+      openstack coe cluster create --cluster-template test-template --keypair id_rsa --master-count 1 --node-count 1 --floating-ip-enabled test-cluster
 
 This command will take a while to complete. You can monitor the progress with
 the following command:

etc/kayobe/ansible/requirements.yml

@@ -1,7 +1,7 @@
 ---
 collections:
   - name: stackhpc.cephadm
-    version: 1.12.2
+    version: 1.13.1
   - name: stackhpc.pulp
     version: 0.4.1
 roles:

etc/kayobe/environments/ci-multinode/seed.yml

@@ -3,7 +3,7 @@ seed_bootstrap_user: "{{ os_distribution if os_distribution == 'ubuntu' else 'cl
 seed_lvm_groups:
   - "{{ stackhpc_lvm_group_rootvg }}"
 
-seed_extra_network_interfaces: "{{ seed_extra_network_interfaces_external + seed_extra_network_interfaces_manila if (kolla_enable_manila | bool and kolla_enable_manila_backend_cephfs_native | bool) else [] }}"
+seed_extra_network_interfaces: "{{ seed_extra_network_interfaces_external + (seed_extra_network_interfaces_manila if (kolla_enable_manila | bool and kolla_enable_manila_backend_cephfs_native | bool) else []) }}"
 
 # Seed has been provided an external interface
 # for tempest tests and SSH access to machines.

etc/kayobe/seed.yml

@@ -106,7 +106,7 @@ seed_pulp_container:
     image: pulp/pulp
     pre: "{{ kayobe_config_path }}/containers/pulp/pre.yml"
     post: "{{ kayobe_config_path }}/containers/pulp/post.yml"
-    tag: "{{ '3.22-https' if pulp_enable_tls | bool else '3.22' }}"
+    tag: "{{ '3.23-https' if pulp_enable_tls | bool else '3.23' }}"
     network_mode: host
     # Override deploy_containers_defaults.init == true to ensure
     # s6-overlay-suexec starts as pid 1

releasenotes/notes/update-pulp-3.23-b4193a417a219d26.yaml

@@ -0,0 +1,3 @@
+---
+features:
+  - Upgrades Pulp from ``3.22`` to ``3.23``.