fixes from Chandan at https://review.opendev.org/c/openstack/tripleo-quickstart/+/803134 & https://review.opendev.org/c/openstack/tripleo-quickstart/+/803307
fixes from Chandan at https:/ /review. opendev. org/c/openstack /tripleo- quickstart/ +/803134 & https:/ /review. opendev. org/c/openstack /tripleo- quickstart/ +/803307