Update aufn env config

etc/kayobe/environments/aufn-ceph/a-universe-from-nothing.sh

@@ -6,8 +6,8 @@
 set -eu
 
 BASE_PATH=~
-KAYOBE_BRANCH=stackhpc/wallaby
-KAYOBE_CONFIG_BRANCH=stackhpc/wallaby
+KAYOBE_BRANCH=stackhpc/yoga
+KAYOBE_CONFIG_BRANCH=stackhpc/yoga
 KAYOBE_ENVIRONMENT=aufn-ceph
 
 # FIXME: Work around lack of DNS on SMS lab.
@@ -67,21 +67,14 @@ source kayobe-env --environment $KAYOBE_ENVIRONMENT
 # Configure host networking (bridge, routes & firewall)
 $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/configure-local-networking.sh
 
-# Deploy Pulp
-$KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/deploy-pulp.sh
-
 # Bootstrap the Ansible control host.
 kayobe control host bootstrap
 
 # Sync package & container repositories.
 kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/pulp-repo-sync.yml
 kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/pulp-repo-publish.yml
-
-# NOTE: Building Ubuntu containers locally for now.
-# if $(which dnf 2>/dev/null >/dev/null); then
 kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/pulp-container-sync.yml
 kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/pulp-container-publish.yml
-# fi
 
 # Configure the seed hypervisor host.
 kayobe seed hypervisor host configure
@@ -92,12 +85,6 @@ kayobe seed vm provision
 # Configure the seed host, and deploy a local registry.
 kayobe seed host configure
 
-# NOTE: Building Ubuntu containers locally for now.
-# if ! $(which dnf 2>/dev/null >/dev/null); then
-#     kayobe seed container image build --push
-#     kayobe overcloud container image build --push
-# fi
-
 # Deploy the seed services.
 kayobe seed service deploy
 
@@ -118,7 +105,6 @@ kayobe overcloud hardware inspect
 kayobe overcloud provision
 kayobe overcloud host configure
 kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/cephadm.yml
-kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/ceph-config.yml
 kayobe overcloud container image pull
 kayobe overcloud service deploy
 source $KOLLA_CONFIG_PATH/public-openrc.sh

etc/kayobe/environments/aufn-ceph/cephadm.yml

@@ -1,14 +1,61 @@
 ---
-# Networking
-cephadm_public_interface: "{{ storage_net_name | net_interface }}"
-cephadm_public_network: "{{ storage_net_name | net_cidr }}"
-cephadm_cluster_interface: "{{ storage_mgmt_net_name | net_interface }}"
-cephadm_cluster_network: "{{ storage_mgmt_net_name | net_cidr }}"
-# OSDs
+###############################################################################
+# Cephadm deployment configuration.
+
+# Ceph container image.
+cephadm_image: "quay.io/ceph/ceph:v16.2.5"
+
+# Ceph OSD specification.
 cephadm_osd_spec:
   service_type: osd
   service_id: osd_spec_default
   placement:
     host_pattern: "*"
   data_devices:
     all: true
+
+###############################################################################
+# Ceph post-deployment configuration.
+
+# List of Ceph erasure coding profiles. See stackhpc.cephadm.ec_profiles role
+# for format.
+cephadm_ec_profiles: []
+
+# List of Ceph CRUSH rules. See stackhpc.cephadm.crush_rules role for format.
+cephadm_crush_rules: []
+
+# List of Ceph pools. See stackhpc.cephadm.pools role for format.
+cephadm_pools:
+  - name: backups
+    application: rbd
+    state: present
+  - name: images
+    application: rbd
+    state: present
+  - name: volumes
+    application: rbd
+    state: present
+  - name: vms
+    application: rbd
+    state: present
+
+# List of Cephx keys. See stackhpc.cephadm.keys role for format.
+cephadm_keys:
+  - name: client.cinder
+    caps:
+      mon: "profile rbd"
+      osd: "profile rbd pool=volumes, profile rbd pool=vms, profile rbd-read-only pool=images"
+      mgr: "profile rbd pool=volumes, profile rbd pool=vms"
+    state: present
+  - name: client.cinder-backup
+    caps:
+      mon: "profile rbd"
+      osd: "profile rbd pool=volumes, profile rbd pool=backups"
+      mgr: "profile rbd pool=volumes, profile rbd pool=backups"
+    state: present
+  - name: client.glance
+    caps:
+      mon: "profile rbd"
+      osd: "profile rbd pool=images"
+      mgr: "profile rbd pool=images"
+    state: present

etc/kayobe/environments/aufn-ceph/inventory/groups

@@ -1,91 +1,5 @@
 # Kayobe groups inventory file. This file should generally not be modified.
-# If declares the top-level groups and sub-groups.
-
-###############################################################################
-# Seed groups.
-
-[seed]
-# Empty group to provide declaration of seed group.
-
-[seed-hypervisor]
-# Empty group to provide declaration of seed-hypervisor group.
-
-[container-image-builders:children]
-# Build container images on the seed by default.
-seed
-
-###############################################################################
-# Overcloud groups.
-
-[controllers]
-# Empty group to provide declaration of controllers group.
-
-[network:children]
-# Add controllers to network group by default for backwards compatibility,
-# although they could be separate hosts.
-controllers
-
-[monitoring]
-# Empty group to provide declaration of monitoring group.
-
-[storage]
-# Empty group to provide declaration of storage group.
-
-[compute]
-# Empty group to provide declaration of compute group.
-
-[overcloud:children]
-controllers
-network
-monitoring
-storage
-compute
-
-###############################################################################
-# Service groups.
-
-[docker:children]
-# Hosts in this group will have Docker installed.
-seed
-controllers
-network
-monitoring
-compute
-
-[docker-registry:children]
-# Hosts in this group will have a Docker Registry deployed. This group should
-# generally contain only a single host, to avoid deploying multiple independent
-# registries which may become unsynchronized.
-seed
-
-[ntp:children]
-# Kayobe will configure Chrony on members of this group.
-seed
-seed-hypervisor
-overcloud
-
-###############################################################################
-# Baremetal compute node groups.
-
-[baremetal-compute]
-# Empty group to provide declaration of baremetal-compute group.
-
-###############################################################################
-# Networking groups.
-
-[mgmt-switches]
-# Empty group to provide declaration of mgmt-switches group.
-
-[ctl-switches]
-# Empty group to provide declaration of ctl-switches group.
-
-[hs-switches]
-# Empty group to provide declaration of hs-switches group.
-
-[switches:children]
-mgmt-switches
-ctl-switches
-hs-switches
+# It declares the top-level groups and sub-groups.
 
 ###############################################################################
 # Ceph groups