diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-03-27 15:22:25 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-04-02 11:13:35 +0000 |
| commit | ad7fcebbf4ed569c6af1c79cd5c355454e18ac7c (patch) | |
| tree | 2ac1383aa2fe6ffbdb552810577f41eb1dc0156f /openstack/usr/lib/systemd | |
| parent | ee1102e63a5db7abce345b15ccbc1a196136e7cf (diff) | |
| download | definitions-ad7fcebbf4ed569c6af1c79cd5c355454e18ac7c.tar.gz | |
openvswitch: Move setup scripts to Ansible.
Also change systemd units and configure extension to match this change
Diffstat (limited to 'openstack/usr/lib/systemd')
| -rw-r--r-- | openstack/usr/lib/systemd/system/openvswitch-initialize-db.service | 10 | ||||
| -rw-r--r-- | openstack/usr/lib/systemd/system/openvswitch-setup.service | 6 |
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 |