Comment 2 for bug 1803700

I've added the suggested code to both scripts and commited to https://github.com/openstack-charmers/openstack-bundles/tree/fix-1803700 branch

I will attempt to test this soon, but if someone else can test that would enable a quicker merge.