Merge "Add 25.2 mosk base env's"
diff --git a/hco/env/ctrl1-wrkr1.yaml b/hco/env/ctrl1-wrkr1.yaml
index b01a633..b007d4e 100644
--- a/hco/env/ctrl1-wrkr1.yaml
+++ b/hco/env/ctrl1-wrkr1.yaml
@@ -9,7 +9,6 @@
public_net_id: c3799996-dc8e-4477-a309-09ea6dd71946
cluster_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCp0evjOaK8c8SKYK4r2+0BN7g+8YSvQ2n8nFgOURCyvkJqOHi1qPGZmuN0CclYVdVuZiXbWw3VxRbSW3EH736VzgY1U0JmoTiSamzLHaWsXvEIW8VCi7boli539QJP0ikJiBaNAgZILyCrVPN+A6mfqtacs1KXdZ0zlMq1BPtFciR1JTCRcVs5vP2Wwz5QtY2jMIh3aiwkePjMTQPcfmh1TkOlxYu5IbQyZ3G1ahA0mNKI9a0dtF282av/F6pwB/N1R1nEZ/9VtcN2I1mf1NW/tTHEEcTzXYo1R/8K9vlqAN8QvvGLZtZduGviNVNoNWvoxaXxDt8CPv2B2NCdQFZp
worker_metadata: {"labels": {"role":"ceph-osd-node"}}
- workers_flavor: 'system.compact.openstack.control.ephemeral'
hardware_metadata: |
'00:00:00:00:00:00':
write_files:
diff --git a/hco/env/ctrl1-wrkr3.yaml b/hco/env/ctrl1-wrkr3.yaml
index ef0145b..e5d8029 100644
--- a/hco/env/ctrl1-wrkr3.yaml
+++ b/hco/env/ctrl1-wrkr3.yaml
@@ -9,7 +9,6 @@
public_net_id: c3799996-dc8e-4477-a309-09ea6dd71946
cluster_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCp0evjOaK8c8SKYK4r2+0BN7g+8YSvQ2n8nFgOURCyvkJqOHi1qPGZmuN0CclYVdVuZiXbWw3VxRbSW3EH736VzgY1U0JmoTiSamzLHaWsXvEIW8VCi7boli539QJP0ikJiBaNAgZILyCrVPN+A6mfqtacs1KXdZ0zlMq1BPtFciR1JTCRcVs5vP2Wwz5QtY2jMIh3aiwkePjMTQPcfmh1TkOlxYu5IbQyZ3G1ahA0mNKI9a0dtF282av/F6pwB/N1R1nEZ/9VtcN2I1mf1NW/tTHEEcTzXYo1R/8K9vlqAN8QvvGLZtZduGviNVNoNWvoxaXxDt8CPv2B2NCdQFZp
worker_metadata: {"labels": {"role":"ceph-osd-node"}}
- workers_flavor: 'system.compact.openstack.control.ephemeral'
hardware_metadata: |
'00:00:00:00:00:00':
write_files:
diff --git a/hco/env/ctrl3-wrkr3.yaml b/hco/env/ctrl3-wrkr3.yaml
new file mode 100644
index 0000000..70b2731
--- /dev/null
+++ b/hco/env/ctrl3-wrkr3.yaml
@@ -0,0 +1,29 @@
+resource_registry:
+ "VMInstances": ../fragments/VMInstance.yaml
+ "VMInstancesCeph": ../fragments/VMInstanceCeph.yaml
+
+parameters:
+ controllers_size: 3
+ workers_size: 3
+ image: jammy-server-cloudimg-amd64-20240417
+ public_net_id: c3799996-dc8e-4477-a309-09ea6dd71946
+ cluster_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCp0evjOaK8c8SKYK4r2+0BN7g+8YSvQ2n8nFgOURCyvkJqOHi1qPGZmuN0CclYVdVuZiXbWw3VxRbSW3EH736VzgY1U0JmoTiSamzLHaWsXvEIW8VCi7boli539QJP0ikJiBaNAgZILyCrVPN+A6mfqtacs1KXdZ0zlMq1BPtFciR1JTCRcVs5vP2Wwz5QtY2jMIh3aiwkePjMTQPcfmh1TkOlxYu5IbQyZ3G1ahA0mNKI9a0dtF282av/F6pwB/N1R1nEZ/9VtcN2I1mf1NW/tTHEEcTzXYo1R/8K9vlqAN8QvvGLZtZduGviNVNoNWvoxaXxDt8CPv2B2NCdQFZp
+ worker_metadata: {"labels": {"role":"ceph-osd-node"}}
+ hardware_metadata: |
+ '00:00:00:00:00:00':
+ write_files:
+ - path: /usr/share/metadata/ceph.yaml
+ content: |
+ storageDevices:
+ - name: vdb
+ role: hdd
+ sizeGb: 20
+ ramGb: 8
+ cores: 2
+ # The roles will be assigned based on node labels.
+ # roles:
+ # - mon
+ # - mgr
+ ips:
+ - 192.168.122.101
+ crushPath: {}
diff --git a/hco/fragments/VMInstance.yaml b/hco/fragments/VMInstance.yaml
index 15dad90..b0eb789 100644
--- a/hco/fragments/VMInstance.yaml
+++ b/hco/fragments/VMInstance.yaml
@@ -54,7 +54,7 @@
handle: { get_resource: wait_handle }
timeout: { get_param: boot_timeout }
- vm_server:
+ server:
type: OS::Nova::Server
properties:
availability_zone: { get_param: availability_zone }
diff --git a/hco/fragments/VMInstanceCeph.yaml b/hco/fragments/VMInstanceCeph.yaml
index 1ba516d..5304d5e 100644
--- a/hco/fragments/VMInstanceCeph.yaml
+++ b/hco/fragments/VMInstanceCeph.yaml
@@ -143,7 +143,7 @@
handle: {get_resource: wait_handle}
timeout: { get_param: boot_timeout }
- vm_server:
+ server:
type: OS::Nova::Server
properties:
availability_zone: { get_param: availability_zone }