Compare commits
2 Commits
559513e629
...
846ded0e57
Author | SHA1 | Date | |
---|---|---|---|
846ded0e57 | |||
7dfea80d2d |
@ -19,22 +19,22 @@ debrelease="{{ debrelease }}"
|
|||||||
{%- if debmirror is defined and debmirror %}
|
{%- if debmirror is defined and debmirror %}
|
||||||
# The Debian mirror to use (overrides the default)
|
# The Debian mirror to use (overrides the default)
|
||||||
debmirror="{{ debmirror }}"
|
debmirror="{{ debmirror }}"
|
||||||
{%- endif %}
|
{% endif %}
|
||||||
|
|
||||||
{%- if addpkglist is defined and addpkglist %}
|
{%- if addpkglist is defined and addpkglist %}
|
||||||
# Additional packages (comma-separated) to install in the base system
|
# Additional packages (comma-separated) to install in the base system
|
||||||
addpkglist="{{ addpkglist }}"
|
addpkglist="{{ addpkglist }}"
|
||||||
{%- endif %}
|
{% endif %}
|
||||||
|
|
||||||
{%- if filesystem is defined and filesystem %}
|
{%- if filesystem is defined and filesystem %}
|
||||||
# Alternate filesystem for system volumes (/, /var/lib/ceph, /var/lib/zookeeper)
|
# Alternate filesystem for system volumes (/, /var/lib/ceph, /var/lib/zookeeper)
|
||||||
filesystem="{{ filesystem }}"
|
filesystem="{{ filesystem }}"
|
||||||
{%- endif %}
|
{% endif %}
|
||||||
|
|
||||||
{%- if skip_blockcheck is defined and skip_blockcheck %}
|
{%- if skip_blockcheck is defined and skip_blockcheck %}
|
||||||
# Skip block zeroing; only recommended for testing, slow, low-endurance, or known-zeroed block devices.
|
# Skip block zeroing; only recommended for testing, slow, low-endurance, or known-zeroed block devices.
|
||||||
skip_blockcheck="y"
|
skip_blockcheck="y"
|
||||||
{%- endif %}
|
{% endif %}
|
||||||
|
|
||||||
###
|
###
|
||||||
### Per-host definitions (required)
|
### Per-host definitions (required)
|
||||||
|
@ -243,8 +243,11 @@ seed_config() {
|
|||||||
is_match="$(
|
is_match="$(
|
||||||
python <<EOF
|
python <<EOF
|
||||||
from re import sub
|
from re import sub
|
||||||
b_size = float(sub(r'\D','','${b_size}'))
|
try:
|
||||||
t_size = float(sub(r'\D','','${size}'))
|
b_size = float(sub(r'\D.','','${b_size}'))
|
||||||
|
t_size = float(sub(r'\D.','','${size}'))
|
||||||
|
except ValueError:
|
||||||
|
exit(0)
|
||||||
plustwopct = t_size * 1.02
|
plustwopct = t_size * 1.02
|
||||||
minustwopct = t_size * 0.98
|
minustwopct = t_size * 0.98
|
||||||
if b_size > minustwopct and b_size < plustwopct:
|
if b_size > minustwopct and b_size < plustwopct:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user