summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible
diff options
context:
space:
mode:
authorYifei Xue <xueyifei@huawei.com>2017-07-20 11:46:14 +0800
committerJustin chi <chigang@huawei.com>2017-07-21 01:35:06 +0000
commitf12c7c6d19eb21cd99690271f4ef71794a24b683 (patch)
treecc75280865ce94d8cce3652d547e2b00abede889 /deploy/adapters/ansible
parent117130a7f905696ccf66f5eef38d1c0eb951629f (diff)
Adjust the plugins directory structure
JIRA:- Since there may be multiple roles in one plugin, so add a level of roles to the directory. Move the copy operation of ODL from configure_osa to a new setup-opendaylgiht role. Add excute_order in the plugin description of ODL. Change-Id: I905fb84b11df201dc1436ec888f511e251bba89c Signed-off-by: Yifei Xue <xueyifei@huawei.com> Signed-off-by: chigang <chigang@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible')
-rw-r--r--deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml1
-rw-r--r--deploy/adapters/ansible/roles/config-osa/tasks/main.yml10
-rw-r--r--deploy/adapters/ansible/roles/config-osa/templates/setup-odl.yml.j212
3 files changed, 1 insertions, 22 deletions
diff --git a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
index 41139c5e..1e721aa6 100644
--- a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
+++ b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
@@ -32,4 +32,5 @@
- role: setup-infrastructure
- role: setup-openstack
- role: setup-openvswitch
+ - role: setup-opendaylight
- role: post-openstack
diff --git a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
index c7663916..b1b32f77 100644
--- a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
@@ -58,16 +58,6 @@
src: setup-ovs.yml
dest: /opt/openstack-ansible/playbooks
-- name: copy setup-odl.yml
- template:
- src: setup-odl.yml.j2
- dest: /opt/openstack-ansible/playbooks/setup-odl.yml
-
-- name: copy odl_cluster role
- copy:
- src: /var/ansible/run/openstack_ocata-opnfv2/roles/odl_cluster
- dest: /etc/ansible/roles/
-
- name: copy flavor roles
copy:
src: os-flavor
diff --git a/deploy/adapters/ansible/roles/config-osa/templates/setup-odl.yml.j2 b/deploy/adapters/ansible/roles/config-osa/templates/setup-odl.yml.j2
deleted file mode 100644
index 18446ce5..00000000
--- a/deploy/adapters/ansible/roles/config-osa/templates/setup-odl.yml.j2
+++ /dev/null
@@ -1,12 +0,0 @@
----
-
-- name: run opendaylight role
- hosts: neutron_all | galera_container | network_hosts | repo_container
- max_fail_percentage: 20
- user: root
- roles:
- - odl_cluster
- vars:
- - odl_l3_agent: "{{ odl_l3_agent }}"
- tags:
- - odl