summaryrefslogtreecommitdiffstats
path: root/plugins/odl_sfc
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2017-10-18 02:07:10 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-10-18 02:07:10 +0000
commit0bd9deecf2efcbb06b24a2c6200c3f6c1326aaf6 (patch)
tree92816763de0bff08e4d850e0da85a159132c9068 /plugins/odl_sfc
parent2e3e4dcfd50ad29f80f675fcefff3c3a579338e5 (diff)
parentd0886a8dcf47ef0d27a0b7960dd152596f0a3a88 (diff)
Merge "add tacker support"
Diffstat (limited to 'plugins/odl_sfc')
-rw-r--r--plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-tacker-1.yml8
-rwxr-xr-xplugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-cluster.yml3
2 files changed, 11 insertions, 0 deletions
diff --git a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-tacker-1.yml b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-tacker-1.yml
new file mode 100644
index 00000000..c43b6dcc
--- /dev/null
+++ b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-tacker-1.yml
@@ -0,0 +1,8 @@
+---
+
+- name: upgrade networking-sfc
+ pip:
+ name: networking-sfc
+ extra_args: -U
+ virtualenv: /openstack/venvs/tacker-15.1.4
+ when: odl_sfc == "Enable"
diff --git a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-cluster.yml b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-cluster.yml
index 07bf7084..ee2ee32a 100755
--- a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-cluster.yml
+++ b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-cluster.yml
@@ -48,4 +48,7 @@
- inventory_hostname in groups['neutron_server'][0]
- inventory_hostname not in groups['network_hosts']
+- include: control-tacker-1.yml
+ when: inventory_hostname in groups['tacker_all']
+
- include: odl-post.yml