From 2114780ff5b4d6de2dc74e9fa1dc34baa74270c5 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Fri, 27 Mar 2015 15:22:25 +0000 Subject: openvswitch: Move setup scripts to Ansible. Also change systemd units and configure extension to match this change --- .../usr/lib/systemd/system/openvswitch-initialize-db.service | 10 ---------- openstack/usr/lib/systemd/system/openvswitch-setup.service | 6 ++---- 2 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 openstack/usr/lib/systemd/system/openvswitch-initialize-db.service (limited to 'openstack/usr/lib/systemd') 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 -- cgit v1.2.1