Merge proposals dependent on lp://qastaging/~james-page/openstack-charm-testing/18.02-updates

lp://qastaging/~james-page/openstack-charm-testing/18.02-updates has no merge proposals.