diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-04-02 09:11:06 +0000 |
|---|---|---|
| committer | Richard Ipsum <richardipsum@fastmail.co.uk> | 2015-04-10 20:17:46 +0100 |
| commit | 3752f83d5bcace4028aaf718ffd762755ffeac3f (patch) | |
| tree | 4015a8af07fc5b01bf5575c239427e7649c1ce7b | |
| parent | 2114780ff5b4d6de2dc74e9fa1dc34baa74270c5 (diff) | |
| download | definitions-3752f83d5bcace4028aaf718ffd762755ffeac3f.tar.gz | |
openvswitch: Change scripts to meet change in ovs instalation
| -rw-r--r-- | openstack/usr/lib/systemd/system/openvswitch-db-server.service | 2 | ||||
| -rw-r--r-- | openstack/usr/share/openstack/openvswitch.yml | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/openstack/usr/lib/systemd/system/openvswitch-db-server.service b/openstack/usr/lib/systemd/system/openvswitch-db-server.service index e1cd2042..5c7e7646 100644 --- a/openstack/usr/lib/systemd/system/openvswitch-db-server.service +++ b/openstack/usr/lib/systemd/system/openvswitch-db-server.service @@ -4,7 +4,7 @@ After=local-fs.target openvswitch-setup.service [Service] Type=forking -ExecStart=/usr/sbin/ovsdb-server --remote=punix:/usr/local/var/run/openvswitch/db.sock --remote=db:Open_vSwitch,Open_vSwitch,manager_options --private-key=db:Open_vSwitch,SSL,private_key --certificate=db:Open_vSwitch,SSL,certificate --bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert --pidfile --detach +ExecStart=/usr/sbin/ovsdb-server --remote=punix:/var/run/openvswitch/db.sock --remote=db:Open_vSwitch,Open_vSwitch,manager_options --private-key=db:Open_vSwitch,SSL,private_key --certificate=db:Open_vSwitch,SSL,certificate --bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert --pidfile --detach [Install] WantedBy=multi-user.target diff --git a/openstack/usr/share/openstack/openvswitch.yml b/openstack/usr/share/openstack/openvswitch.yml index dd6eeac0..731d32c4 100644 --- a/openstack/usr/share/openstack/openvswitch.yml +++ b/openstack/usr/share/openstack/openvswitch.yml @@ -6,12 +6,12 @@ - name: Create openvswitch directories file: path={{ item }} state=directory with_items: - - /usr/local/etc/openvswitch - - /usr/local/var/run/openvswitch + - /etc/openvswitch + - /var/run/openvswitch - shell: > - ovsdb-tool create /usr/local/etc/openvswitch/conf.db /usr/share/openvswitch/vswitch.ovsschema - creates=/usr/local/etc/openvswitch/conf.db + ovsdb-tool create /etc/openvswitch/conf.db /usr/share/openvswitch/vswitch.ovsschema + creates=/etc/openvswitch/conf.db # We enable the openvswitch-db-server in a different task to identify # the first time we run this script by identifying when we enable the |