summaryrefslogtreecommitdiff
path: root/openstack/usr/lib/systemd
diff options
context:
space:
mode:
Diffstat (limited to 'openstack/usr/lib/systemd')
-rw-r--r--openstack/usr/lib/systemd/system/openvswitch-initialize-db.service10
-rw-r--r--openstack/usr/lib/systemd/system/openvswitch-setup.service6
2 files changed, 2 insertions, 14 deletions
diff --git a/openstack/usr/lib/systemd/system/openvswitch-initialize-db.service b/openstack/usr/lib/systemd/system/openvswitch-initialize-db.service
deleted file mode 100644
index 3c564c5a..00000000
--- a/openstack/usr/lib/systemd/system/openvswitch-initialize-db.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Run openvswitch-initialize-db (once)
-After=local-fs.target openvswitch-db-server.service
-
-ConditionPathExists=!/usr/local/var/run/openvswitch/openvswitch-initialize-db-flag
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/ovs-vsctl --no-wait init
-ExecStart=/bin/touch /usr/local/var/run/openvswitch/openvswitch-initialize-db-flag
diff --git a/openstack/usr/lib/systemd/system/openvswitch-setup.service b/openstack/usr/lib/systemd/system/openvswitch-setup.service
index bfe67002..1dbda6d8 100644
--- a/openstack/usr/lib/systemd/system/openvswitch-setup.service
+++ b/openstack/usr/lib/systemd/system/openvswitch-setup.service
@@ -1,11 +1,9 @@
[Unit]
-Description=Run openvswitch-setup (once)
+Description=Run openvswitch-setup Ansible scripts
After=local-fs.target
[Service]
-Type=oneshot
-ExecStart=/usr/share/openstack/openvswitch-setup
-Restart=no
+ExecStart=/usr/bin/ansible-playbook -v -i /usr/share/openstack/hosts /usr/share/openstack/openvswitch.yml
[Install]
WantedBy=multi-user.target