summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles/setup-openvswitch
diff options
context:
space:
mode:
authorYifei Xue <xueyifei@huawei.com>2017-11-01 11:46:18 +0800
committerYifei Xue <xueyifei@huawei.com>2017-11-28 21:39:19 +0800
commit10361fd56fac5f7aebba44402bf9a501854d00c3 (patch)
tree205b76c0831e272e71dbef64c3c10ea332f13eea /deploy/adapters/ansible/roles/setup-openvswitch
parent9a76ddb1075479c891389a0c9303d80ead9895a0 (diff)
Upgrade OpenStack version from Ocata to Pike
JIRA: COMPASS-565 For OPNFV F release, it's going to use OpenStack Pike as the NFVI component. This task is created to monitor the upgrade work of OpenStack Pike. Subtasks as follow: - Add Pike related configurations to compass_conf - Upgrade ubuntu os to ubuntu 16.04.3 - Upgrade centos os to centos 7.4 - Upgrade openstack-ansible from ocata to pike - Upgrade openstack repos from ocata to pike Change-Id: I2202e8e3ae23dae8e575c89170c9e5e057757870 Signed-off-by: Yifei Xue <xueyifei@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/setup-openvswitch')
-rw-r--r--deploy/adapters/ansible/roles/setup-openvswitch/tasks/compute.yml9
-rw-r--r--deploy/adapters/ansible/roles/setup-openvswitch/tasks/controller.yml9
-rw-r--r--deploy/adapters/ansible/roles/setup-openvswitch/vars/Debian.yml3
-rw-r--r--deploy/adapters/ansible/roles/setup-openvswitch/vars/RedHat.yml3
4 files changed, 22 insertions, 2 deletions
diff --git a/deploy/adapters/ansible/roles/setup-openvswitch/tasks/compute.yml b/deploy/adapters/ansible/roles/setup-openvswitch/tasks/compute.yml
index b7a8fbcb..43c6689f 100644
--- a/deploy/adapters/ansible/roles/setup-openvswitch/tasks/compute.yml
+++ b/deploy/adapters/ansible/roles/setup-openvswitch/tasks/compute.yml
@@ -7,11 +7,18 @@
# http://www.apache.org/licenses/LICENSE-2.0
#############################################################################
---
+- include_vars: "{{ ansible_os_family }}.yml"
+
- name: stop neutron-openvswitch-agent
service:
name: neutron-openvswitch-agent
state: stopped
+- name: restart openvswitch service
+ service:
+ name: "{{ ovs_service }}"
+ state: restarted
+
- name: remove tunnel_types when vlan
lineinfile:
dest: /etc/neutron/plugins/ml2/openvswitch_agent.ini
@@ -43,7 +50,7 @@
when:
- compute in item["role"]
-- name: stop neutron-openvswitch-agent
+- name: start neutron-openvswitch-agent
service:
name: neutron-openvswitch-agent
state: started
diff --git a/deploy/adapters/ansible/roles/setup-openvswitch/tasks/controller.yml b/deploy/adapters/ansible/roles/setup-openvswitch/tasks/controller.yml
index 258a39e2..3637d1db 100644
--- a/deploy/adapters/ansible/roles/setup-openvswitch/tasks/controller.yml
+++ b/deploy/adapters/ansible/roles/setup-openvswitch/tasks/controller.yml
@@ -7,11 +7,18 @@
# http://www.apache.org/licenses/LICENSE-2.0
#############################################################################
---
+- include_vars: "{{ ansible_os_family }}.yml"
+
- name: stop neutron-openvswitch-agent
service:
name: neutron-openvswitch-agent
state: stopped
+- name: restart openvswitch service
+ service:
+ name: "{{ ovs_service }}"
+ state: restarted
+
- name: remove tunnel_types when vlan
lineinfile:
dest: /etc/neutron/plugins/ml2/openvswitch_agent.ini
@@ -43,7 +50,7 @@
when:
- controller in item["role"]
-- name: stop neutron-openvswitch-agent
+- name: start neutron-openvswitch-agent
service:
name: neutron-openvswitch-agent
state: started
diff --git a/deploy/adapters/ansible/roles/setup-openvswitch/vars/Debian.yml b/deploy/adapters/ansible/roles/setup-openvswitch/vars/Debian.yml
new file mode 100644
index 00000000..b6bd95a8
--- /dev/null
+++ b/deploy/adapters/ansible/roles/setup-openvswitch/vars/Debian.yml
@@ -0,0 +1,3 @@
+---
+
+ovs_service: openvswitch-switch
diff --git a/deploy/adapters/ansible/roles/setup-openvswitch/vars/RedHat.yml b/deploy/adapters/ansible/roles/setup-openvswitch/vars/RedHat.yml
new file mode 100644
index 00000000..c6a9e43b
--- /dev/null
+++ b/deploy/adapters/ansible/roles/setup-openvswitch/vars/RedHat.yml
@@ -0,0 +1,3 @@
+---
+
+ovs_service: openvswitch