diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-03-27 15:22:25 +0000 |
|---|---|---|
| committer | Richard Ipsum <richardipsum@fastmail.co.uk> | 2015-04-10 20:17:46 +0100 |
| commit | 2114780ff5b4d6de2dc74e9fa1dc34baa74270c5 (patch) | |
| tree | 3747efdf9cc369161efe8a183fd7ee93555aeac5 /openstack/usr/lib/systemd | |
| parent | c67183cb206a96f642bb54b7e5b9aa278876293d (diff) | |
| download | definitions-2114780ff5b4d6de2dc74e9fa1dc34baa74270c5.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 |