diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-02-18 00:30:20 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-02-20 23:36:56 +0100 |
| commit | f6f8a56b40c5268d94cdb8e9aef6ea937f68a18e (patch) | |
| tree | 0ea233cf0ed520dc6dd66ac153dcc1f590ad2d41 | |
| parent | 0acee8e72f3670f9886bcc28cac9ef5f7885c6a0 (diff) | |
[HA] [cinder] Switch loop to free space on sda
On cmp nodes, we assing 30G (fixed) to rootfs, use the rest for
cinder.
Note: AArch64 gets one extra partition (the EFI System Partition or
ESP) on /dev/sda1 via MaaS.
JIRA: FUEL-330
Change-Id: I2a36107d074532b627bd2349cafc0c8ee61f500f
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml | 13 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2 | 7 |
2 files changed, 18 insertions, 2 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml index cb10bbb62..cb7b32f53 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml @@ -8,7 +8,6 @@ --- classes: - system.linux.system.repo.glusterfs - - system.linux.storage.loopback - system.glusterfs.client.cluster - system.nova.compute.cluster - system.nova.compute.nfv.hugepages @@ -34,7 +33,6 @@ parameters: interface_mtu: 1500 keepalived_vip_interface: br-ctl keepalived_vip_virtual_router_id: 69 - loopback_device_size: 20 linux_system_codename: xenial glusterfs_version: '3.13' glusterfs: @@ -45,7 +43,18 @@ parameters: server: ${_param:glusterfs_service_host} # yamllint disable-line rule:line-length opts: "defaults,backup-volfile-servers=${_param:cluster_node01_address}:${_param:cluster_node02_address}:${_param:cluster_node03_address}" + cinder: + volume: + backend: + lvm-driver: + # Align system.cinder.volume.backend.lvm and MaaS data + volume_group: ${linux:storage:lvm:cinder-vg:name} linux: + storage: + lvm: + # Align with both system.cinder.volume.backend.lvm and MaaS data + cinder-vg: + name: vgroot system: kernel: sysctl: diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2 index ed9ddd6b4..a14796178 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2 @@ -12,6 +12,13 @@ {%- set vlans = { nm.vlan_admin: nm.cmp001.nic_admin, nm.vlan_mgmt: nm.cmp001.nic_mgmt } %} --- parameters: + _param: + # Should later be determined via PDF/IDF, AArch64 has ESP on /dev/sda1 +{%- if conf.nodes[nm.cmp001.idx].node.arch == 'aarch64' %} + ~cinder_lvm_devices: [ '/dev/sda2' ] +{%- else %} + ~cinder_lvm_devices: [ '/dev/sda1' ] +{%- endif %} linux: network: bridge: openvswitch |