diff options
author | Richard Maw <richard.maw@codethink.co.uk> | 2015-03-20 16:57:46 +0000 |
---|---|---|
committer | Richard Maw <richard.maw@codethink.co.uk> | 2015-03-20 16:57:46 +0000 |
commit | 207b836c41a593bb54e2a9f28c66c776c421a756 (patch) | |
tree | be623f858abfbc7c7c136bc21c9dbee9ce7e6474 /openstack-neutron.configure | |
parent | 697850ed65e9655773623231bf1a7393a5929e85 (diff) | |
parent | 73a471f4cc4e8e6ae33b6519f5c4e6d47d0ada95 (diff) | |
download | definitions-207b836c41a593bb54e2a9f28c66c776c421a756.tar.gz |
Merge branch 'baserock/richardmaw/openstack-v4/reliability-rebase' into baserock/openstack-v4baserock/openstack-v4
Reviewed-by: Pedro Alvarez (+2)
Diffstat (limited to 'openstack-neutron.configure')
-rw-r--r-- | openstack-neutron.configure | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/openstack-neutron.configure b/openstack-neutron.configure index 71b29713..5b71c09c 100644 --- a/openstack-neutron.configure +++ b/openstack-neutron.configure @@ -44,7 +44,6 @@ sed -f "$ROOT"/etc/openstack-neutron-setup.sed -i \ # Create the links to enable the neutron systemd services # ########################################################################## services=("openstack-neutron-network-configuration-one-node.service" \ - "openvswitch-create-links-one-node.service" \ "openstack-neutron-dhcp-agent.service" \ "openstack-neutron-l3-agent.service" \ "openstack-neutron-metadata-agent.service" \ @@ -57,3 +56,12 @@ for service in ${services[@]}; do ln -sf "/etc/systemd/system/$service" \ "$ROOT/etc/systemd/system/multi-user.target.wants/$service" done + +############################################# +# Ensure /var/run is an appropriate symlink # +############################################# + +if ! link="$(readlink "$ROOT/var/run")" || [ "$link" != ../run ]; then + rm -rf "$ROOT/var/run" + ln -s ../run "$ROOT/var/run" +fi |