From 5617a545e22f77412914f3d1cd9aa99f01468e10 Mon Sep 17 00:00:00 2001 From: Peter Matulis Date: Wed, 11 Oct 2023 23:19:17 -0400 Subject: [PATCH] Update for Jammy Bobcat Depends-On: I74315e5a64902d7e96e3557cb99d89493e62ad4c Change-Id: Ieca2f9d580ec6bdf7dae33101ace61f8d03c1f6d Signed-off-by: Peter Matulis --- ...y-2023.1.yaml => bundle-jammy-2023.2.yaml} | 30 +++++++++---------- doc/source/getting-started/deploy.rst | 4 +-- doc/source/getting-started/index.rst | 8 ++--- doc/source/getting-started/openstack.rst | 5 ---- 4 files changed, 21 insertions(+), 26 deletions(-) rename doc/source/getting-started/{bundle-jammy-2023.1.yaml => bundle-jammy-2023.2.yaml} (95%) diff --git a/doc/source/getting-started/bundle-jammy-2023.1.yaml b/doc/source/getting-started/bundle-jammy-2023.2.yaml similarity index 95% rename from doc/source/getting-started/bundle-jammy-2023.1.yaml rename to doc/source/getting-started/bundle-jammy-2023.2.yaml index 283a518b..2726f7a0 100644 --- a/doc/source/getting-started/bundle-jammy-2023.1.yaml +++ b/doc/source/getting-started/bundle-jammy-2023.2.yaml @@ -136,7 +136,7 @@ applications: gui-x: '790' gui-y: '1540' charm: ch:ceph-mon - channel: quincy/stable + channel: reef/stable num_units: 3 options: expected-osd-count: *expected-osd-count @@ -150,7 +150,7 @@ applications: gui-x: '1065' gui-y: '1540' charm: ch:ceph-osd - channel: quincy/stable + channel: reef/stable num_units: 3 options: osd-devices: *osd-devices @@ -163,7 +163,7 @@ applications: gui-x: '850' gui-y: '900' charm: ch:ceph-radosgw - channel: quincy/stable + channel: reef/stable num_units: 1 to: - lxd:0 @@ -178,7 +178,7 @@ applications: gui-x: '980' gui-y: '1270' charm: ch:cinder - channel: 2023.1/stable + channel: 2023.2/stable num_units: 1 options: block-device: None @@ -190,7 +190,7 @@ applications: gui-x: '1120' gui-y: '1400' charm: ch:cinder-ceph - channel: 2023.1/stable + channel: 2023.2/stable num_units: 0 glance-mysql-router: annotations: @@ -203,7 +203,7 @@ applications: gui-x: '-230' gui-y: '1270' charm: ch:glance - channel: 2023.1/stable + channel: 2023.2/stable num_units: 1 to: - lxd:2 @@ -218,7 +218,7 @@ applications: gui-x: '300' gui-y: '1270' charm: ch:keystone - channel: 2023.1/stable + channel: 2023.2/stable num_units: 1 to: - lxd:0 @@ -233,13 +233,13 @@ applications: gui-x: '690' gui-y: '1385' charm: ch:neutron-api-plugin-ovn - channel: 2023.1/stable + channel: 2023.2/stable neutron-api: annotations: gui-x: '580' gui-y: '1270' charm: ch:neutron-api - channel: 2023.1/stable + channel: 2023.2/stable num_units: 1 options: neutron-security-groups: true @@ -257,7 +257,7 @@ applications: gui-x: '1320' gui-y: '1270' charm: ch:placement - channel: 2023.1/stable + channel: 2023.2/stable num_units: 1 to: - lxd:2 @@ -272,7 +272,7 @@ applications: gui-x: '35' gui-y: '1270' charm: ch:nova-cloud-controller - channel: 2023.1/stable + channel: 2023.2/stable num_units: 1 options: network-manager: Neutron @@ -283,7 +283,7 @@ applications: gui-x: '190' gui-y: '890' charm: ch:nova-compute - channel: 2023.1/stable + channel: 2023.2/stable num_units: 3 options: config-flags: default_ephemeral_format=ext4 @@ -305,7 +305,7 @@ applications: gui-x: '585' gui-y: '900' charm: ch:openstack-dashboard - channel: 2023.1/stable + channel: 2023.2/stable num_units: 1 to: - lxd:1 @@ -334,7 +334,7 @@ applications: gui-x: '70' gui-y: '1550' charm: ch:ovn-central - channel: 23.03/stable + channel: 23.09/stable num_units: 3 to: - lxd:0 @@ -345,7 +345,7 @@ applications: gui-x: '120' gui-y: '1030' charm: ch:ovn-chassis - channel: 23.03/stable + channel: 23.09/stable options: ovn-bridge-mappings: physnet1:br-ex bridge-interface-mappings: *data-port diff --git a/doc/source/getting-started/deploy.rst b/doc/source/getting-started/deploy.rst index ab511f73..4401c216 100644 --- a/doc/source/getting-started/deploy.rst +++ b/doc/source/getting-started/deploy.rst @@ -14,7 +14,7 @@ Ensure that the current context is the previously-created controller and model: juju switch maas-controller:openstack -Download bundle file :download:`bundle-jammy-2023.1.yaml` and save it in the +Download bundle file :download:`bundle-jammy-2023.2.yaml` and save it in the ``~/tutorial`` directory. Enter the tutorial directory and deploy OpenStack by referring to the bundle @@ -23,7 +23,7 @@ and the overlay: .. code-block:: none cd ~/tutorial - juju deploy ./bundle-jammy-2023.1.yaml --overlay ./overlay-mymaas.yaml + juju deploy ./bundle-jammy-2023.2.yaml --overlay ./overlay-mymaas.yaml This stage of the procedure can take between 30 and 90 minutes to complete, depending on how the MAAS nodes are resourced. Use the :command:`juju status` diff --git a/doc/source/getting-started/index.rst b/doc/source/getting-started/index.rst index be959412..56e41acf 100644 --- a/doc/source/getting-started/index.rst +++ b/doc/source/getting-started/index.rst @@ -9,8 +9,8 @@ This tutorial shows how to deploy a test Charmed OpenStack cloud. Its major software elements are: * Ubuntu 22.04 LTS (Jammy) for the cloud nodes -* OpenStack 2023.1 (Antelope) -* Ceph Quincy +* OpenStack 2023.2 (Bobcat) +* Ceph Reef OpenStack services will include Compute, Network, Block Storage, Object Storage, Identity, Image, and Dashboard. @@ -54,8 +54,8 @@ Software The software versions used in this tutorial are: -* MAAS 3.2.7 -* Juju 2.9.42 +* MAAS 3.3.4 +* Juju 3.1.6 Client ~~~~~~ diff --git a/doc/source/getting-started/openstack.rst b/doc/source/getting-started/openstack.rst index a44c7b6b..46156000 100644 --- a/doc/source/getting-started/openstack.rst +++ b/doc/source/getting-started/openstack.rst @@ -22,11 +22,6 @@ Download cloud init file :download:`openrc ` and save it in the ``~/tutorial`` directory. It will assist you in setting up admin access to the cloud. -.. important:: - - This ``openrc`` file does not support the Juju 2.9.x client. Read support - note :ref:`juju_29_3x_changes` before continuing. - Now source the file and test cloud access by querying the Keystone service catalogue: