From f12c7c6d19eb21cd99690271f4ef71794a24b683 Mon Sep 17 00:00:00 2001 From: Yifei Xue Date: Thu, 20 Jul 2017 11:46:14 +0800 Subject: 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 Signed-off-by: chigang --- .../roles/setup-opendaylight/tasks/main.yml | 25 ++++++++++++++++++++++ .../setup-opendaylight/templates/setup-odl.yml.j2 | 12 +++++++++++ 2 files changed, 37 insertions(+) create mode 100644 plugins/odl_cluster/roles/setup-opendaylight/tasks/main.yml create mode 100644 plugins/odl_cluster/roles/setup-opendaylight/templates/setup-odl.yml.j2 (limited to 'plugins/odl_cluster/roles/setup-opendaylight') diff --git a/plugins/odl_cluster/roles/setup-opendaylight/tasks/main.yml b/plugins/odl_cluster/roles/setup-opendaylight/tasks/main.yml new file mode 100644 index 00000000..3abca829 --- /dev/null +++ b/plugins/odl_cluster/roles/setup-opendaylight/tasks/main.yml @@ -0,0 +1,25 @@ +############################################################################## +# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- + +- 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: setup odl + shell: "export ANSIBLE_LOG_PATH=/var/ansible/run/openstack_ocata-opnfv2/ansible.log; \ + cd /opt/openstack-ansible/playbooks; \ + openstack-ansible setup-odl.yml > /dev/null" + when: opendaylight is defined and opendaylight == "Enable" diff --git a/plugins/odl_cluster/roles/setup-opendaylight/templates/setup-odl.yml.j2 b/plugins/odl_cluster/roles/setup-opendaylight/templates/setup-odl.yml.j2 new file mode 100644 index 00000000..18446ce5 --- /dev/null +++ b/plugins/odl_cluster/roles/setup-opendaylight/templates/setup-odl.yml.j2 @@ -0,0 +1,12 @@ +--- + +- 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 -- cgit 1.2.3-korg