diff options
Diffstat (limited to 'lib/undercloud-functions.sh')
| -rwxr-xr-x | lib/undercloud-functions.sh | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/undercloud-functions.sh b/lib/undercloud-functions.sh index 5e9a5caa..d2ba6bca 100755 --- a/lib/undercloud-functions.sh +++ b/lib/undercloud-functions.sh @@ -165,11 +165,6 @@ EOI # root's auth keys so that Undercloud can control # vm power on the hypervisor ssh ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" "cat /home/stack/.ssh/id_rsa.pub" >> /root/.ssh/authorized_keys - - INSTACKENV=$CONFIG/instackenv-virt.json - - # upload instackenv file to Undercloud for virtual deployment - scp ${SSH_OPTIONS[@]} $INSTACKENV "stack@$UNDERCLOUD":instackenv.json fi # allow stack to control power management on the hypervisor via sshkey @@ -211,6 +206,8 @@ if [[ "$net_isolation_enabled" == "TRUE" ]]; then openstack-config --set undercloud.conf DEFAULT inspection_iprange ${admin_network_introspection_range} openstack-config --set undercloud.conf DEFAULT undercloud_debug false openstack-config --set undercloud.conf DEFAULT undercloud_hostname "undercloud.${domain_name}" + sudo openstack-config --set /etc/ironic/ironic.conf disk_utils iscsi_verify_attempts 30 + sudo openstack-config --set /etc/ironic/ironic.conf disk_partitioner check_device_max_retries 40 fi |