diff options
| -rw-r--r-- | deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml | 19 | ||||
| -rw-r--r-- | util/ks.cfg | 31 |
2 files changed, 33 insertions, 17 deletions
diff --git a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml index cf43b1cc..362426df 100644 --- a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml +++ b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml @@ -37,24 +37,28 @@ key: "{{ lookup('file', 'item') }}" with_fileglob: - /tmp/ssh-keys-* + max_fail_percentage: 0 roles: - common - hosts: all remote_user: root accelerate: true + max_fail_percentage: 0 roles: - setup-network - hosts: ha remote_user: root accelerate: true + max_fail_percentage: 0 roles: - ha - hosts: controller remote_user: root accelerate: true + max_fail_percentage: 0 roles: - memcached - database @@ -74,12 +78,14 @@ - hosts: all remote_user: root accelerate: true + max_fail_percentage: 0 roles: - storage - hosts: compute remote_user: root accelerate: true + max_fail_percentage: 0 roles: - nova-compute - neutron-compute @@ -89,18 +95,21 @@ - hosts: all remote_user: root accelerate: true + max_fail_percentage: 0 roles: - secgroup - hosts: ceph_adm remote_user: root accelerate: true + max_fail_percentage: 0 roles: [] # - ceph-deploy - hosts: ceph remote_user: root accelerate: true + max_fail_percentage: 0 roles: - ceph-purge - ceph-config @@ -108,24 +117,28 @@ - hosts: ceph_mon remote_user: root accelerate: true + max_fail_percentage: 0 roles: - ceph-mon - hosts: ceph_osd remote_user: root accelerate: true + max_fail_percentage: 0 roles: - ceph-osd - hosts: ceph remote_user: root accelerate: true + max_fail_percentage: 0 roles: - ceph-openstack - hosts: all remote_user: root accelerate: true + max_fail_percentage: 0 roles: - monitor @@ -133,6 +146,7 @@ - hosts: all remote_user: root accelerate: true + max_fail_percentage: 0 tasks: - name: set bash to nova user: @@ -178,27 +192,32 @@ - hosts: all remote_user: root + max_fail_percentage: 0 roles: - odl_cluster - hosts: all remote_user: root accelerate: true + max_fail_percentage: 0 roles: - onos_cluster - hosts: all remote_user: root sudo: True + max_fail_percentage: 0 roles: - open-contrail - hosts: controller remote_user: root + max_fail_percentage: 0 roles: - ext-network - hosts: all remote_user: root + max_fail_percentage: 0 roles: - odl_cluster_post diff --git a/util/ks.cfg b/util/ks.cfg index dd31d8fd..76ce0ff6 100644 --- a/util/ks.cfg +++ b/util/ks.cfg @@ -34,20 +34,15 @@ skipx # System timezone timezone America/Los_Angeles --isUtc # System bootloader configuration -bootloader --append=" crashkernel=auto" --location=mbr --boot-drive=sda + +%include /tmp/bootloader.ks + # Clear the Master Boot Record zerombr # Partition clearing information clearpart --all --initlabel # Disk partitioning information -part swap --asprimary --fstype="swap" --ondisk=sda --size=3072 -part /boot --asprimary --fstype="ext3" --ondisk=sda --size=500 -part pv.64 --fstype="lvmpv" --ondisk=sda --size=27145 -volgroup os --pesize=4096 pv.64 -logvol /var --fstype="ext3" --grow --percent=40 --name=varvol --vgname=os -logvol /tmp --fstype="ext3" --grow --percent=5 --name=tmpvol --vgname=os -logvol / --fstype="ext3" --grow --percent=50 --name=rootvol --vgname=os -logvol /home --fstype="ext3" --grow --percent=5 --name=homevol --vgname=os +%include /tmp/partition.ks %pre #!/bin/sh @@ -124,14 +119,16 @@ sleep 3 hdparm -z /dev/${tgtdrive} # partition -echo > /tmp/partition.ks -echo "partition /boot --onpart=/dev/${tgtdrive}3" >> /tmp/partition.ks -echo "partition pv.001 --ondisk=${tgtdrive} --size=30000 --grow" >> /tmp/partition.ks -echo "volgroup os pv.001" >> /tmp/partition.ks -echo "logvol swap --vgname=os --recommended --name=swap" >> /tmp/partition.ks -echo "logvol / --vgname=os --size=10000 --name=root --fstype=ext4" >> /tmp/partition.ks -echo "logvol /var --vgname=os --size=10000 --percent 60 --grow --name=var --fstype=ext4" >> /tmp/partition.ks -echo "logvol /var/log --vgname=os --size=4096 --percent 40 --grow --name=varlog --fstype=ext4" >> /tmp/partition.ks +cat << EOF > /tmp/partition.ks +part swap --asprimary --fstype="swap" --ondisk=sda --size=3072 +part /boot --asprimary --fstype="ext3" --ondisk=sda --size=500 +part pv.64 --fstype="lvmpv" --ondisk=sda --size=$((tgtdrivesize-3600)) +volgroup os --pesize=4096 pv.64 +logvol /var --fstype="ext3" --grow --percent=40 --name=varvol --vgname=os +logvol /tmp --fstype="ext3" --grow --percent=5 --name=tmpvol --vgname=os +logvol / --fstype="ext3" --grow --percent=50 --name=rootvol --vgname=os +logvol /home --fstype="ext3" --grow --percent=5 --name=homevol --vgname=os +EOF # bootloader setting echo "bootloader --location=mbr --driveorder=${tgtdrive} --append=' biosdevname=0 crashkernel=none'" > /tmp/bootloader.ks |