summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-04-02 09:11:06 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-04-08 18:29:30 +0100
commit60a7a346782d6674ab9bffe34af18cd2c9b9fa38 (patch)
tree8a2c0ff8b87fd288159b2f7c640fb649e2bc5df4
parent01b19e35598989582f44a3ce622878f02a924d0e (diff)
downloaddefinitions-60a7a346782d6674ab9bffe34af18cd2c9b9fa38.tar.gz
openvswitch: Change scripts to meet change in ovs instalation
-rw-r--r--openstack/usr/lib/systemd/system/openvswitch-db-server.service2
-rw-r--r--openstack/usr/share/openstack/openvswitch.yml8
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