summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--openstack/usr/lib/systemd/system/openstack-neutron-network-configuration-one-node.service13
-rw-r--r--openstack/usr/lib/systemd/system/openstack-neutron-setup.service9
2 files changed, 3 insertions, 19 deletions
diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-network-configuration-one-node.service b/openstack/usr/lib/systemd/system/openstack-neutron-network-configuration-one-node.service
deleted file mode 100644
index 2b1d168b..00000000
--- a/openstack/usr/lib/systemd/system/openstack-neutron-network-configuration-one-node.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Configuration script to set Openstack in one node networking
-Wants=network-online.target
-After=network-online.target openvswitch.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/share/openstack/openstack-neutron-network-configuration-for-one-node
-Restart=no
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-setup.service b/openstack/usr/lib/systemd/system/openstack-neutron-setup.service
index 858e76e9..2e317964 100644
--- a/openstack/usr/lib/systemd/system/openstack-neutron-setup.service
+++ b/openstack/usr/lib/systemd/system/openstack-neutron-setup.service
@@ -1,13 +1,10 @@
[Unit]
-Description=Run openstack-neutron-setup (once)
-Wants=openstack-neutron-network-configuration-one-node.service
-After=network-online.target openstack-keystone-setup.service openstack-neutron-network-configuration-one-node.service postgres-server.service
+Description=Run neutron-setup Ansible scripts
+After=network-online.target openstack-keystone-setup.service postgres-server.service
[Service]
-Type=oneshot
+ExecStart=/usr/bin/ansible-playbook -v -M /usr/share/ansible/ansible-openstack-modules -i /usr/share/openstack/hosts /usr/share/openstack/neutron.yml
ExecStart=/usr/share/openstack/openstack-neutron-setup
-Restart=no
-RemainAfterExit=yes
[Install]
WantedBy=multi-user.target