Prepare for LVM based VCP
This patch adds metadata needed to setup partitions on
VCP with LVM.
The new param 'image_layout' is added to salt:control:size:<size_name>
This is metadata that describes partition layout of VCP.
For now VCP has predefined list of partitions see
https://gerrit.mcp.mirantis.com/#/c/30862/
image_layout defines sizes for each of partitions that should be
applied after VCP is provisioned. The resizing will be done by
growlvmp.py script placed on VCP
https://gerrit.mcp.mirantis.com/#/c/31052/
The default layout:
image_layout:
root:
size: '30%VG' # 30% of VG total size
home:
size: '1G' # fixed size 1G
var_log:
size: '11%VG' # 11% of VG total size
var_log_audit:
size: '5G' # fixed size 5G
var_tmp:
size: '11%VG' # 11% of VG total size
tmp:
size: '5G' # fixed size 5G
Related-Prod: PROD-24537
Change-Id: I18205dfa8478be2ae092a87ced833c8ab0cc01ea
diff --git a/salt/control/sizes/openstack/compact.yml b/salt/control/sizes/openstack/compact.yml
index 4955911..70e4ff2 100644
--- a/salt/control/sizes/openstack/compact.yml
+++ b/salt/control/sizes/openstack/compact.yml
@@ -48,48 +48,58 @@
ram: ${_param:salt_control_size_ram_openstack_control}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_control}
net_profile: ${_param:salt_control_size_net_profile_openstack_control}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_control}
openstack.database:
cpu: ${_param:salt_control_size_cpu_openstack_database}
ram: ${_param:salt_control_size_ram_openstack_database}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_database}
net_profile: ${_param:salt_control_size_net_profile_openstack_database}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_database}
openstack.message_queue:
cpu: ${_param:salt_control_size_cpu_openstack_message_queue}
ram: ${_param:salt_control_size_ram_openstack_message_queue}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_message_queue}
net_profile: ${_param:salt_control_size_net_profile_openstack_message_queue}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_message_queue}
openstack.proxy:
cpu: ${_param:salt_control_size_cpu_openstack_proxy}
ram: ${_param:salt_control_size_ram_openstack_proxy}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_proxy}
net_profile: ${_param:salt_control_size_net_profile_openstack_proxy}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_proxy}
openstack.upgrade:
cpu: ${_param:salt_control_size_cpu_openstack_upgrade}
ram: ${_param:salt_control_size_ram_openstack_upgrade}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_upgrade}
net_profile: ${_param:salt_control_size_net_profile_openstack_upgrade}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_upgrade}
openstack.share:
cpu: ${_param:salt_control_size_cpu_openstack_share}
ram: ${_param:salt_control_size_ram_openstack_share}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_share}
net_profile: ${_param:salt_control_size_net_profile_openstack_share}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_share}
openstack.dns:
cpu: ${_param:salt_control_size_cpu_openstack_dns}
ram: ${_param:salt_control_size_ram_openstack_dns}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_dns}
net_profile: ${_param:salt_control_size_net_profile_openstack_dns}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_dns}
openstack.telemetry:
cpu: ${_param:salt_control_size_cpu_openstack_telemetry}
ram: ${_param:salt_control_size_ram_openstack_telemetry}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_telemetry}
net_profile: ${_param:salt_control_size_net_profile_openstack_telemetry}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_telemetry}
openstack.barbican:
cpu: ${_param:salt_control_size_cpu_openstack_barbican}
ram: ${_param:salt_control_size_ram_openstack_barbican}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_barbican}
net_profile: ${_param:salt_control_size_net_profile_openstack_barbican}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_barbican}
openstack.baremetal:
cpu: ${_param:salt_control_size_cpu_openstack_baremetal}
ram: ${_param:salt_control_size_ram_openstack_baremetal}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_baremetal}
- net_profile: ${_param:salt_control_size_net_profile_openstack_baremetal}
\ No newline at end of file
+ net_profile: ${_param:salt_control_size_net_profile_openstack_baremetal}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_baremetal}
diff --git a/salt/control/sizes/openstack/large.yml b/salt/control/sizes/openstack/large.yml
index cd7d71e..38dc313 100644
--- a/salt/control/sizes/openstack/large.yml
+++ b/salt/control/sizes/openstack/large.yml
@@ -48,48 +48,58 @@
ram: ${_param:salt_control_size_ram_openstack_control}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_control}
net_profile: ${_param:salt_control_size_net_profile_openstack_control}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_control}
openstack.database:
cpu: ${_param:salt_control_size_cpu_openstack_database}
ram: ${_param:salt_control_size_ram_openstack_database}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_database}
net_profile: ${_param:salt_control_size_net_profile_openstack_database}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_database}
openstack.message_queue:
cpu: ${_param:salt_control_size_cpu_openstack_message_queue}
ram: ${_param:salt_control_size_ram_openstack_message_queue}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_message_queue}
net_profile: ${_param:salt_control_size_net_profile_openstack_message_queue}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_message_queue}
openstack.proxy:
cpu: ${_param:salt_control_size_cpu_openstack_proxy}
ram: ${_param:salt_control_size_ram_openstack_proxy}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_proxy}
net_profile: ${_param:salt_control_size_net_profile_openstack_proxy}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_proxy}
openstack.upgrade:
cpu: ${_param:salt_control_size_cpu_openstack_upgrade}
ram: ${_param:salt_control_size_ram_openstack_upgrade}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_upgrade}
net_profile: ${_param:salt_control_size_net_profile_openstack_upgrade}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_upgrade}
openstack.share:
cpu: ${_param:salt_control_size_cpu_openstack_share}
ram: ${_param:salt_control_size_ram_openstack_share}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_share}
net_profile: ${_param:salt_control_size_net_profile_openstack_share}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_share}
openstack.dns:
cpu: ${_param:salt_control_size_cpu_openstack_dns}
ram: ${_param:salt_control_size_ram_openstack_dns}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_dns}
net_profile: ${_param:salt_control_size_net_profile_openstack_dns}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_dns}
openstack.telemetry:
cpu: ${_param:salt_control_size_cpu_openstack_telemetry}
ram: ${_param:salt_control_size_ram_openstack_telemetry}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_telemetry}
net_profile: ${_param:salt_control_size_net_profile_openstack_telemetry}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_telemetry}
openstack.barbican:
cpu: ${_param:salt_control_size_cpu_openstack_barbican}
ram: ${_param:salt_control_size_ram_openstack_barbican}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_barbican}
net_profile: ${_param:salt_control_size_net_profile_openstack_barbican}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_barbican}
openstack.baremetal:
cpu: ${_param:salt_control_size_cpu_openstack_baremetal}
ram: ${_param:salt_control_size_ram_openstack_baremetal}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_baremetal}
- net_profile: ${_param:salt_control_size_net_profile_openstack_baremetal}
\ No newline at end of file
+ net_profile: ${_param:salt_control_size_net_profile_openstack_baremetal}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_baremetal}
diff --git a/salt/control/sizes/openstack/medium.yml b/salt/control/sizes/openstack/medium.yml
index 4ff4570..cadaa79 100644
--- a/salt/control/sizes/openstack/medium.yml
+++ b/salt/control/sizes/openstack/medium.yml
@@ -48,48 +48,58 @@
ram: ${_param:salt_control_size_ram_openstack_control}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_control}
net_profile: ${_param:salt_control_size_net_profile_openstack_control}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_control}
openstack.database:
cpu: ${_param:salt_control_size_cpu_openstack_database}
ram: ${_param:salt_control_size_ram_openstack_database}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_database}
net_profile: ${_param:salt_control_size_net_profile_openstack_database}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_database}
openstack.message_queue:
cpu: ${_param:salt_control_size_cpu_openstack_message_queue}
ram: ${_param:salt_control_size_ram_openstack_message_queue}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_message_queue}
net_profile: ${_param:salt_control_size_net_profile_openstack_message_queue}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_message_queue}
openstack.proxy:
cpu: ${_param:salt_control_size_cpu_openstack_proxy}
ram: ${_param:salt_control_size_ram_openstack_proxy}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_proxy}
net_profile: ${_param:salt_control_size_net_profile_openstack_proxy}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_proxy}
openstack.upgrade:
cpu: ${_param:salt_control_size_cpu_openstack_upgrade}
ram: ${_param:salt_control_size_ram_openstack_upgrade}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_upgrade}
net_profile: ${_param:salt_control_size_net_profile_openstack_upgrade}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_upgrade}
openstack.share:
cpu: ${_param:salt_control_size_cpu_openstack_share}
ram: ${_param:salt_control_size_ram_openstack_share}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_share}
net_profile: ${_param:salt_control_size_net_profile_openstack_share}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_share}
openstack.dns:
cpu: ${_param:salt_control_size_cpu_openstack_dns}
ram: ${_param:salt_control_size_ram_openstack_dns}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_dns}
net_profile: ${_param:salt_control_size_net_profile_openstack_dns}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_dns}
openstack.telemetry:
cpu: ${_param:salt_control_size_cpu_openstack_telemetry}
ram: ${_param:salt_control_size_ram_openstack_telemetry}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_telemetry}
net_profile: ${_param:salt_control_size_net_profile_openstack_telemetry}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_telemetry}
openstack.barbican:
cpu: ${_param:salt_control_size_cpu_openstack_barbican}
ram: ${_param:salt_control_size_ram_openstack_barbican}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_barbican}
net_profile: ${_param:salt_control_size_net_profile_openstack_barbican}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_barbican}
openstack.baremetal:
cpu: ${_param:salt_control_size_cpu_openstack_baremetal}
ram: ${_param:salt_control_size_ram_openstack_baremetal}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_baremetal}
- net_profile: ${_param:salt_control_size_net_profile_openstack_baremetal}
\ No newline at end of file
+ net_profile: ${_param:salt_control_size_net_profile_openstack_baremetal}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_baremetal}
diff --git a/salt/control/sizes/openstack/minimal.yml b/salt/control/sizes/openstack/minimal.yml
index e24a597..b3b2a85 100644
--- a/salt/control/sizes/openstack/minimal.yml
+++ b/salt/control/sizes/openstack/minimal.yml
@@ -48,48 +48,58 @@
ram: ${_param:salt_control_size_ram_openstack_control}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_control}
net_profile: ${_param:salt_control_size_net_profile_openstack_control}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_control}
openstack.database:
cpu: ${_param:salt_control_size_cpu_openstack_database}
ram: ${_param:salt_control_size_ram_openstack_database}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_database}
net_profile: ${_param:salt_control_size_net_profile_openstack_database}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_database}
openstack.message_queue:
cpu: ${_param:salt_control_size_cpu_openstack_message_queue}
ram: ${_param:salt_control_size_ram_openstack_message_queue}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_message_queue}
net_profile: ${_param:salt_control_size_net_profile_openstack_message_queue}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_message_queue}
openstack.proxy:
cpu: ${_param:salt_control_size_cpu_openstack_proxy}
ram: ${_param:salt_control_size_ram_openstack_proxy}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_proxy}
net_profile: ${_param:salt_control_size_net_profile_openstack_proxy}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_proxy}
openstack.upgrade:
cpu: ${_param:salt_control_size_cpu_openstack_upgrade}
ram: ${_param:salt_control_size_ram_openstack_upgrade}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_upgrade}
net_profile: ${_param:salt_control_size_net_profile_openstack_upgrade}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_upgrade}
openstack.share:
cpu: ${_param:salt_control_size_cpu_openstack_share}
ram: ${_param:salt_control_size_ram_openstack_share}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_share}
net_profile: ${_param:salt_control_size_net_profile_openstack_share}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_share}
openstack.dns:
cpu: ${_param:salt_control_size_cpu_openstack_dns}
ram: ${_param:salt_control_size_ram_openstack_dns}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_dns}
net_profile: ${_param:salt_control_size_net_profile_openstack_dns}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_dns}
openstack.telemetry:
cpu: ${_param:salt_control_size_cpu_openstack_telemetry}
ram: ${_param:salt_control_size_ram_openstack_telemetry}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_telemetry}
net_profile: ${_param:salt_control_size_net_profile_openstack_telemetry}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_telemetry}
openstack.barbican:
cpu: ${_param:salt_control_size_cpu_openstack_barbican}
ram: ${_param:salt_control_size_ram_openstack_barbican}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_barbican}
net_profile: ${_param:salt_control_size_net_profile_openstack_barbican}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_barbican}
openstack.baremetal:
cpu: ${_param:salt_control_size_cpu_openstack_baremetal}
ram: ${_param:salt_control_size_ram_openstack_baremetal}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_baremetal}
- net_profile: ${_param:salt_control_size_net_profile_openstack_baremetal}
\ No newline at end of file
+ net_profile: ${_param:salt_control_size_net_profile_openstack_baremetal}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_baremetal}
diff --git a/salt/control/sizes/openstack/small.yml b/salt/control/sizes/openstack/small.yml
index 32b2113..ab3700a 100644
--- a/salt/control/sizes/openstack/small.yml
+++ b/salt/control/sizes/openstack/small.yml
@@ -48,48 +48,58 @@
ram: ${_param:salt_control_size_ram_openstack_control}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_control}
net_profile: ${_param:salt_control_size_net_profile_openstack_control}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_control}
openstack.database:
cpu: ${_param:salt_control_size_cpu_openstack_database}
ram: ${_param:salt_control_size_ram_openstack_database}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_database}
net_profile: ${_param:salt_control_size_net_profile_openstack_database}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_database}
openstack.message_queue:
cpu: ${_param:salt_control_size_cpu_openstack_message_queue}
ram: ${_param:salt_control_size_ram_openstack_message_queue}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_message_queue}
net_profile: ${_param:salt_control_size_net_profile_openstack_message_queue}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_message_queue}
openstack.proxy:
cpu: ${_param:salt_control_size_cpu_openstack_proxy}
ram: ${_param:salt_control_size_ram_openstack_proxy}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_proxy}
net_profile: ${_param:salt_control_size_net_profile_openstack_proxy}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_proxy}
openstack.upgrade:
cpu: ${_param:salt_control_size_cpu_openstack_upgrade}
ram: ${_param:salt_control_size_ram_openstack_upgrade}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_upgrade}
net_profile: ${_param:salt_control_size_net_profile_openstack_upgrade}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_upgrade}
openstack.share:
cpu: ${_param:salt_control_size_cpu_openstack_share}
ram: ${_param:salt_control_size_ram_openstack_share}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_share}
net_profile: ${_param:salt_control_size_net_profile_openstack_share}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_share}
openstack.dns:
cpu: ${_param:salt_control_size_cpu_openstack_dns}
ram: ${_param:salt_control_size_ram_openstack_dns}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_dns}
net_profile: ${_param:salt_control_size_net_profile_openstack_dns}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_dns}
openstack.telemetry:
cpu: ${_param:salt_control_size_cpu_openstack_telemetry}
ram: ${_param:salt_control_size_ram_openstack_telemetry}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_telemetry}
net_profile: ${_param:salt_control_size_net_profile_openstack_telemetry}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_telemetry}
openstack.barbican:
cpu: ${_param:salt_control_size_cpu_openstack_barbican}
ram: ${_param:salt_control_size_ram_openstack_barbican}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_barbican}
net_profile: ${_param:salt_control_size_net_profile_openstack_barbican}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_barbican}
openstack.baremetal:
cpu: ${_param:salt_control_size_cpu_openstack_baremetal}
ram: ${_param:salt_control_size_ram_openstack_baremetal}
disk_profile: ${_param:salt_control_size_disk_profile_openstack_baremetal}
- net_profile: ${_param:salt_control_size_net_profile_openstack_baremetal}
\ No newline at end of file
+ net_profile: ${_param:salt_control_size_net_profile_openstack_baremetal}
+ image_layout: ${_param:salt_control_size_image_layout_openstack_baremetal}