summaryrefslogtreecommitdiffstats
path: root/plugins/odl_sfc/roles/setup-sfc
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/odl_sfc/roles/setup-sfc')
-rw-r--r--plugins/odl_sfc/roles/setup-sfc/files/setup-odl.yml.j213
-rw-r--r--plugins/odl_sfc/roles/setup-sfc/tasks/setup_sfc.yml20
2 files changed, 2 insertions, 31 deletions
diff --git a/plugins/odl_sfc/roles/setup-sfc/files/setup-odl.yml.j2 b/plugins/odl_sfc/roles/setup-sfc/files/setup-odl.yml.j2
deleted file mode 100644
index 0d0cbe90..00000000
--- a/plugins/odl_sfc/roles/setup-sfc/files/setup-odl.yml.j2
+++ /dev/null
@@ -1,13 +0,0 @@
----
-
-- name: run opendaylight role
- hosts: neutron_all | galera_container | network_hosts | repo_container | utility
- max_fail_percentage: 20
- user: root
- roles:
- - odl_cluster
- vars:
- - odl_l3_agent: "{{ odl_l3_agent }}"
- - odl_sfc: "{{ odl_sfc }}"
- tags:
- - odl
diff --git a/plugins/odl_sfc/roles/setup-sfc/tasks/setup_sfc.yml b/plugins/odl_sfc/roles/setup-sfc/tasks/setup_sfc.yml
index 9fa9175f..eb8b5aa6 100644
--- a/plugins/odl_sfc/roles/setup-sfc/tasks/setup_sfc.yml
+++ b/plugins/odl_sfc/roles/setup-sfc/tasks/setup_sfc.yml
@@ -7,24 +7,8 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
---
-# yamllint disable rule:line-length
-- name: clear setup-odl.yml.j2
- file:
- path: "/var/ansible/run/openstack_ocata-opnfv2/roles/setup-opendaylight/templates/setup-odl.yml.j2"
- state: absent
-# yamllint enable rule:line-length
-
-- name: override setup-odl.yml.j2
- copy:
- src: setup-odl.yml.j2
- dest: "/var/ansible/run/openstack_ocata-opnfv2/roles/setup-opendaylight/templates/"
-
-- name: clear odl_cluster for sfc
- file:
- path: "/var/ansible/run/openstack_ocata-opnfv2/roles/odl_cluster"
- state: absent
- name: copy odl_cluster role
shell: |
- cp -r /var/ansible/run/openstack_ocata-opnfv2/roles/odl_cluster_sfc \
- /var/ansible/run/openstack_ocata-opnfv2/roles/odl_cluster
+ cp -rf /var/ansible/run/openstack_ocata-opnfv2/roles/setup-odl-sfc \
+ /var/ansible/run/openstack_ocata-opnfv2/roles/setup-odl