Skip to content

Commit 59afe06

Browse files
rebtoorcursoragent
andcommitted
Enable Ceph for uni05epsilon adoption scenario
Add external Ceph deployment to the uni05epsilon multi-cell adoption scenario, following the uni04delta pattern. The Ceph cluster is deployed on the cell1 and cell2 compute nodes (which have OSD disks) as an external cluster before the TripleO overcloud deploy. All three stacks (overcloud, cell1, cell2) reference the external-ceph environment and generated credentials. Changes: - Add ceph_inventory.yaml targeting cell1/cell2 computes - Add osd_spec.yaml for OSD device configuration - Add pre_oc_run hooks to overcloud stack: setup ceph nodes, deploy ceph cluster, create external ceph parameters - Add external-ceph.yaml environment to all three stacks Related: OSPNW-1658 Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent f8f7b32 commit 59afe06

6 files changed

Lines changed: 67 additions & 0 deletions

File tree

scenarios/uni05epsilon.yaml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,33 @@ stacks:
6161
- "/usr/share/openstack-tripleo-heat-templates/environments/podman.yaml"
6262
- "/usr/share/openstack-tripleo-heat-templates/environments/low-memory-usage.yaml"
6363
- "/usr/share/openstack-tripleo-heat-templates/environments/debug.yaml"
64+
- "/usr/share/openstack-tripleo-heat-templates/environments/external-ceph.yaml"
65+
- "/home/zuul/external_ceph_params.yaml"
6466
network_data_file: "uni05epsilon/network_data.yaml.j2"
6567
routes: *sroutes
6668
vips_data_file: "uni05epsilon/vips_data_overcloud.yaml"
6769
roles_file: "uni05epsilon/roles.yaml"
6870
config_download_file: "uni05epsilon/config_download_overcloud.yaml"
6971
stack_nodes:
7072
- osp-controllers
73+
pre_oc_run:
74+
- name: 01 Prepare Ceph nodes
75+
type: playbook
76+
source: "setup_cephnodes.yaml"
77+
inventory: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/data-plane-adoption'].
78+
src_dir }}/scenarios/uni05epsilon/ceph_inventory.yaml"
79+
- name: 02 Deploy external ceph
80+
type: playbook
81+
source: "ceph.yml"
82+
gathering: implicit
83+
inventory: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/data-plane-adoption'].
84+
src_dir }}/scenarios/uni05epsilon/ceph_inventory.yaml"
85+
- name: 03 Create external Ceph parameters file
86+
type: playbook
87+
source: "create_external_ceph_params.yml"
88+
extra_vars:
89+
ceph_node: "cell1-osp-compute-uni05epsilon-0"
90+
ceph_mon_host: "172.18.0.94,172.18.0.95"
7191
post_oc_run:
7292
- name: Multi-cell post overcloud deploy
7393
type: playbook
@@ -93,6 +113,8 @@ stacks:
93113
- "/usr/share/openstack-tripleo-heat-templates/environments/low-memory-usage.yaml"
94114
- "/usr/share/openstack-tripleo-heat-templates/environments/debug.yaml"
95115
- "/usr/share/openstack-tripleo-heat-templates/environments/enable-legacy-telemetry.yaml"
116+
- "/usr/share/openstack-tripleo-heat-templates/environments/external-ceph.yaml"
117+
- "/home/zuul/external_ceph_params.yaml"
96118
- "/home/zuul/cell1-input.yaml"
97119
network_data_file: "uni05epsilon/network_data.yaml.j2"
98120
routes: *sroutes
@@ -132,6 +154,8 @@ stacks:
132154
- "/usr/share/openstack-tripleo-heat-templates/environments/podman.yaml"
133155
- "/usr/share/openstack-tripleo-heat-templates/environments/low-memory-usage.yaml"
134156
- "/usr/share/openstack-tripleo-heat-templates/environments/debug.yaml"
157+
- "/usr/share/openstack-tripleo-heat-templates/environments/external-ceph.yaml"
158+
- "/home/zuul/external_ceph_params.yaml"
135159
- "/home/zuul/cell2-input.yaml"
136160
network_data_file: "uni05epsilon/network_data.yaml.j2"
137161
routes: *sroutes
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
computes:
2+
hosts:
3+
cell1-osp-compute-uni05epsilon-0:
4+
ansible_user: zuul
5+
ansible_ssh_private_key_file: /home/zuul/.ssh/cifmw_reproducer_key
6+
bridge_ip: 192.168.122.94/24
7+
external_ip: 172.21.0.94/24
8+
internalapi_ip: 172.17.0.94/24
9+
storage_ip: 172.18.0.94/24
10+
storagemgmt_ip: 172.20.0.94/24
11+
tenant_ip: 172.19.0.94/24
12+
cell2-osp-compute-uni05epsilon-0:
13+
ansible_user: zuul
14+
ansible_ssh_private_key_file: /home/zuul/.ssh/cifmw_reproducer_key
15+
bridge_ip: 192.168.122.95/24
16+
external_ip: 172.21.0.95/24
17+
internalapi_ip: 172.17.0.95/24
18+
storage_ip: 172.18.0.95/24
19+
storagemgmt_ip: 172.20.0.95/24
20+
tenant_ip: 172.19.0.95/24

scenarios/uni05epsilon/config_download_cell1.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,12 @@ resource_registry:
4343

4444
parameter_defaults:
4545
SshFirewallAllowAll: true
46+
ExtraFirewallRules:
47+
'110 ceph_mon':
48+
dport:
49+
- 3300
50+
- 6789
51+
proto: tcp
4652

4753
# Specify that this is an additional cell
4854
NovaAdditionalCell: true

scenarios/uni05epsilon/config_download_cell2.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,12 @@ resource_registry:
4343

4444
parameter_defaults:
4545
SshFirewallAllowAll: true
46+
ExtraFirewallRules:
47+
'110 ceph_mon':
48+
dport:
49+
- 3300
50+
- 6789
51+
proto: tcp
4652

4753
# Specify that this is an additional cell
4854
NovaAdditionalCell: true
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
data_devices:
3+
all: true

scenarios/uni05epsilon/roles.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
- OS::TripleO::Services::AuditD
4747
- OS::TripleO::Services::BootParams
4848
- OS::TripleO::Services::CACerts
49+
- OS::TripleO::Services::CephClient
50+
- OS::TripleO::Services::CephExternal
4951
- OS::TripleO::Services::CinderApi
5052
- OS::TripleO::Services::CinderBackendDellSc
5153
- OS::TripleO::Services::CinderBackendDellEMCPowerFlex
@@ -165,6 +167,8 @@
165167
- OS::TripleO::Services::AuditD
166168
- OS::TripleO::Services::BootParams
167169
- OS::TripleO::Services::CACerts
170+
- OS::TripleO::Services::CephClient
171+
- OS::TripleO::Services::CephExternal
168172
- OS::TripleO::Services::Clustercheck
169173
- OS::TripleO::Services::Collectd
170174
- OS::TripleO::Services::ContainerImagePrepare
@@ -217,6 +221,8 @@
217221
subnet: tenant_subnet
218222
Storage:
219223
subnet: storage_subnet
224+
StorageMgmt:
225+
subnet: storage_mgmt_subnet
220226
default_route_networks: ['ControlPlane']
221227
HostnameFormatDefault: '%stackname%-novacompute-%index%'
222228
RoleParametersDefault:
@@ -240,6 +246,8 @@
240246
- OS::TripleO::Services::AuditD
241247
- OS::TripleO::Services::BootParams
242248
- OS::TripleO::Services::CACerts
249+
- OS::TripleO::Services::CephClient
250+
- OS::TripleO::Services::CephExternal
243251
- OS::TripleO::Services::ComputeNeutronCorePlugin
244252
- OS::TripleO::Services::ComputeNeutronL3Agent
245253
- OS::TripleO::Services::ComputeNeutronMetadataAgent

0 commit comments

Comments
 (0)