diff options
author | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2015-01-30 17:30:48 +0000 |
---|---|---|
committer | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2015-02-11 18:30:36 +0000 |
commit | 5b200971bb787369332e204bbee5a1caac008ffb (patch) | |
tree | d9aed3e8dd7ddea146fed2e3c26db7c3d9050da8 /openstack | |
parent | eb69b0a50a856eb8ca4ee9f09250fce9fc86dc62 (diff) | |
download | definitions-5b200971bb787369332e204bbee5a1caac008ffb.tar.gz |
Remove the manual enable of the neutron services this is done now in deployment time
Diffstat (limited to 'openstack')
-rw-r--r-- | openstack/usr/share/openstack/openstack-neutron-setup | 36 |
1 files changed, 7 insertions, 29 deletions
diff --git a/openstack/usr/share/openstack/openstack-neutron-setup b/openstack/usr/share/openstack/openstack-neutron-setup index 17a4e9fd..03899ede 100644 --- a/openstack/usr/share/openstack/openstack-neutron-setup +++ b/openstack/usr/share/openstack/openstack-neutron-setup @@ -17,6 +17,10 @@ set -xe +if [ -f /var/openstack/openstack-neutron-setup ]; then + exit 0 +fi + # Create required system users and groups getent group neutron >/dev/null || groupadd -r --gid 166 neutron @@ -84,34 +88,8 @@ if ! sudo -u postgres psql -lqt | grep -q neutron; then upgrade juno fi -# Remove the one-shot setup service -rm /etc/systemd/system/multi-user.target.wants/openstack-neutron-setup.service - -# Start neutron services -systemctl start openstack-neutron-server -systemctl start openstack-neutron-metadata-agent -systemctl start openstack-neutron-plugin-openvswitch-agent -systemctl start openstack-neutron-ovs-cleanup -systemctl start openstack-neutron-dhcp-agent -systemctl start openstack-neutron-l3-agent - -# Create the links to run neutron services when system start next times. -ln -s "/etc/systemd/system/openstack-neutron-server.service" \ - "/etc/systemd/system/multi-user.target.wants/openstack-neutron-server.service" - -ln -s "/etc/systemd/system/openstack-neutron-metadata-agent.service" \ - "/etc/systemd/system/multi-user.target.wants/openstack-neutron-metadata-agent.service" - -ln -s "/etc/systemd/system/openstack-neutron-plugin-openvswitch-agent.service" \ - "/etc/systemd/system/multi-user.target.wants/openstack-neutron-plugin-openvswitch-agent.service" - -ln -s "/etc/systemd/system/openstack-neutron-ovs-cleanup.service" \ - "/etc/systemd/system/multi-user.target.wants/openstack-neutron-ovs-cleanup.service" - -ln -s "/etc/systemd/system/openstack-neutron-dhcp-agent.service" \ - "/etc/systemd/system/multi-user.target.wants/openstack-neutron-dhcp-agent.service" - -ln -s "/etc/systemd/system/openstack-neutron-l3-agent.service" \ - "/etc/systemd/system/multi-user.target.wants/openstack-neutron-l3-agent.service" +install -D -m 644 /proc/self/fd/0 <<'EOF' /var/openstack/openstack-neutron-setup +Openstack neutron setup: success +EOF exit 0 |