From f12c7c6d19eb21cd99690271f4ef71794a24b683 Mon Sep 17 00:00:00 2001 From: Yifei Xue Date: Thu, 20 Jul 2017 11:46:14 +0800 Subject: [PATCH] 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 --- .../ansible/openstack/HA-ansible-multinodes.yml | 1 + .../ansible/roles/config-osa/tasks/main.yml | 10 --------- plugins/ntp/{ => roles/ntp}/handlers/main.yml | 0 plugins/ntp/{ => roles/ntp}/tasks/main.yml | 0 plugins/ntp/{ => roles/ntp}/templates/ntp.conf.j2 | 0 plugins/ntp/{ => roles/ntp}/vars/main.yml | 0 plugins/odl_cluster/plugins.desc | 8 +++++-- .../odl_cluster}/files/opendaylight.service | 0 .../{ => roles/odl_cluster}/handlers/main.yml | 0 .../odl_cluster}/tasks/control-agents-1.yml | 0 .../odl_cluster}/tasks/control-agents-2.yml | 0 .../odl_cluster}/tasks/control-agents-3.yml | 0 .../{ => roles/odl_cluster}/tasks/control-db-1.yml | 0 .../odl_cluster}/tasks/control-hosts-1.yml | 0 .../odl_cluster}/tasks/control-hosts-2.yml | 0 .../odl_cluster}/tasks/control-repos-1.yml | 0 .../odl_cluster}/tasks/control-servers-1.yml | 0 .../odl_cluster}/tasks/control-servers-2.yml | 0 .../odl_cluster}/tasks/control-servers-3.yml | 0 .../{ => roles/odl_cluster}/tasks/main.yml | 0 .../{ => roles/odl_cluster}/tasks/odl-post.yml | 0 .../{ => roles/odl_cluster}/templates/acl_conf.sh | 0 .../odl_cluster}/templates/custom.properties | 0 .../{ => roles/odl_cluster}/templates/ml2_conf.sh | 0 .../templates/org.apache.karaf.features.cfg | 0 .../{ => roles/odl_cluster}/vars/Debian.yml | 0 .../{ => roles/odl_cluster}/vars/RedHat.yml | 0 .../{ => roles/odl_cluster}/vars/main.yml | 0 .../roles/setup-opendaylight/tasks/main.yml | 25 ++++++++++++++++++++++ .../setup-opendaylight}/templates/setup-odl.yml.j2 | 0 plugins/rt_kvm/{ => roles/rt_kvm}/tasks/kvm.yml | 0 plugins/rt_kvm/{ => roles/rt_kvm}/tasks/main.yml | 0 plugins/rt_kvm/{ => roles/rt_kvm}/vars/main.yml | 0 33 files changed, 32 insertions(+), 12 deletions(-) rename plugins/ntp/{ => roles/ntp}/handlers/main.yml (100%) rename plugins/ntp/{ => roles/ntp}/tasks/main.yml (100%) rename plugins/ntp/{ => roles/ntp}/templates/ntp.conf.j2 (100%) rename plugins/ntp/{ => roles/ntp}/vars/main.yml (100%) rename plugins/odl_cluster/{ => roles/odl_cluster}/files/opendaylight.service (100%) rename plugins/odl_cluster/{ => roles/odl_cluster}/handlers/main.yml (100%) rename plugins/odl_cluster/{ => roles/odl_cluster}/tasks/control-agents-1.yml (100%) rename plugins/odl_cluster/{ => roles/odl_cluster}/tasks/control-agents-2.yml (100%) rename plugins/odl_cluster/{ => roles/odl_cluster}/tasks/control-agents-3.yml (100%) rename plugins/odl_cluster/{ => roles/odl_cluster}/tasks/control-db-1.yml (100%) rename plugins/odl_cluster/{ => roles/odl_cluster}/tasks/control-hosts-1.yml (100%) rename plugins/odl_cluster/{ => roles/odl_cluster}/tasks/control-hosts-2.yml (100%) rename plugins/odl_cluster/{ => roles/odl_cluster}/tasks/control-repos-1.yml (100%) rename plugins/odl_cluster/{ => roles/odl_cluster}/tasks/control-servers-1.yml (100%) rename plugins/odl_cluster/{ => roles/odl_cluster}/tasks/control-servers-2.yml (100%) rename plugins/odl_cluster/{ => roles/odl_cluster}/tasks/control-servers-3.yml (100%) rename plugins/odl_cluster/{ => roles/odl_cluster}/tasks/main.yml (100%) rename plugins/odl_cluster/{ => roles/odl_cluster}/tasks/odl-post.yml (100%) rename plugins/odl_cluster/{ => roles/odl_cluster}/templates/acl_conf.sh (100%) rename plugins/odl_cluster/{ => roles/odl_cluster}/templates/custom.properties (100%) rename plugins/odl_cluster/{ => roles/odl_cluster}/templates/ml2_conf.sh (100%) rename plugins/odl_cluster/{ => roles/odl_cluster}/templates/org.apache.karaf.features.cfg (100%) rename plugins/odl_cluster/{ => roles/odl_cluster}/vars/Debian.yml (100%) rename plugins/odl_cluster/{ => roles/odl_cluster}/vars/RedHat.yml (100%) rename plugins/odl_cluster/{ => roles/odl_cluster}/vars/main.yml (100%) create mode 100644 plugins/odl_cluster/roles/setup-opendaylight/tasks/main.yml rename {deploy/adapters/ansible/roles/config-osa => plugins/odl_cluster/roles/setup-opendaylight}/templates/setup-odl.yml.j2 (100%) rename plugins/rt_kvm/{ => roles/rt_kvm}/tasks/kvm.yml (100%) rename plugins/rt_kvm/{ => roles/rt_kvm}/tasks/main.yml (100%) rename plugins/rt_kvm/{ => roles/rt_kvm}/vars/main.yml (100%) 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/plugins/ntp/handlers/main.yml b/plugins/ntp/roles/ntp/handlers/main.yml similarity index 100% rename from plugins/ntp/handlers/main.yml rename to plugins/ntp/roles/ntp/handlers/main.yml diff --git a/plugins/ntp/tasks/main.yml b/plugins/ntp/roles/ntp/tasks/main.yml similarity index 100% rename from plugins/ntp/tasks/main.yml rename to plugins/ntp/roles/ntp/tasks/main.yml diff --git a/plugins/ntp/templates/ntp.conf.j2 b/plugins/ntp/roles/ntp/templates/ntp.conf.j2 similarity index 100% rename from plugins/ntp/templates/ntp.conf.j2 rename to plugins/ntp/roles/ntp/templates/ntp.conf.j2 diff --git a/plugins/ntp/vars/main.yml b/plugins/ntp/roles/ntp/vars/main.yml similarity index 100% rename from plugins/ntp/vars/main.yml rename to plugins/ntp/roles/ntp/vars/main.yml diff --git a/plugins/odl_cluster/plugins.desc b/plugins/odl_cluster/plugins.desc index 04e78f99..86413aef 100644 --- a/plugins/odl_cluster/plugins.desc +++ b/plugins/odl_cluster/plugins.desc @@ -49,8 +49,12 @@ plugin: orchestration: cm: ansible roles: - - role: opendaylight - phrase: post_openstack + - role: setup_opendaylight + excute_after: setup_openvswitch + inventory: + - localhost + - role: odl_cluster + excute_in: setup_opendaylight inventory: - neutron_all - galera_container diff --git a/plugins/odl_cluster/files/opendaylight.service b/plugins/odl_cluster/roles/odl_cluster/files/opendaylight.service similarity index 100% rename from plugins/odl_cluster/files/opendaylight.service rename to plugins/odl_cluster/roles/odl_cluster/files/opendaylight.service diff --git a/plugins/odl_cluster/handlers/main.yml b/plugins/odl_cluster/roles/odl_cluster/handlers/main.yml similarity index 100% rename from plugins/odl_cluster/handlers/main.yml rename to plugins/odl_cluster/roles/odl_cluster/handlers/main.yml diff --git a/plugins/odl_cluster/tasks/control-agents-1.yml b/plugins/odl_cluster/roles/odl_cluster/tasks/control-agents-1.yml similarity index 100% rename from plugins/odl_cluster/tasks/control-agents-1.yml rename to plugins/odl_cluster/roles/odl_cluster/tasks/control-agents-1.yml diff --git a/plugins/odl_cluster/tasks/control-agents-2.yml b/plugins/odl_cluster/roles/odl_cluster/tasks/control-agents-2.yml similarity index 100% rename from plugins/odl_cluster/tasks/control-agents-2.yml rename to plugins/odl_cluster/roles/odl_cluster/tasks/control-agents-2.yml diff --git a/plugins/odl_cluster/tasks/control-agents-3.yml b/plugins/odl_cluster/roles/odl_cluster/tasks/control-agents-3.yml similarity index 100% rename from plugins/odl_cluster/tasks/control-agents-3.yml rename to plugins/odl_cluster/roles/odl_cluster/tasks/control-agents-3.yml diff --git a/plugins/odl_cluster/tasks/control-db-1.yml b/plugins/odl_cluster/roles/odl_cluster/tasks/control-db-1.yml similarity index 100% rename from plugins/odl_cluster/tasks/control-db-1.yml rename to plugins/odl_cluster/roles/odl_cluster/tasks/control-db-1.yml diff --git a/plugins/odl_cluster/tasks/control-hosts-1.yml b/plugins/odl_cluster/roles/odl_cluster/tasks/control-hosts-1.yml similarity index 100% rename from plugins/odl_cluster/tasks/control-hosts-1.yml rename to plugins/odl_cluster/roles/odl_cluster/tasks/control-hosts-1.yml diff --git a/plugins/odl_cluster/tasks/control-hosts-2.yml b/plugins/odl_cluster/roles/odl_cluster/tasks/control-hosts-2.yml similarity index 100% rename from plugins/odl_cluster/tasks/control-hosts-2.yml rename to plugins/odl_cluster/roles/odl_cluster/tasks/control-hosts-2.yml diff --git a/plugins/odl_cluster/tasks/control-repos-1.yml b/plugins/odl_cluster/roles/odl_cluster/tasks/control-repos-1.yml similarity index 100% rename from plugins/odl_cluster/tasks/control-repos-1.yml rename to plugins/odl_cluster/roles/odl_cluster/tasks/control-repos-1.yml diff --git a/plugins/odl_cluster/tasks/control-servers-1.yml b/plugins/odl_cluster/roles/odl_cluster/tasks/control-servers-1.yml similarity index 100% rename from plugins/odl_cluster/tasks/control-servers-1.yml rename to plugins/odl_cluster/roles/odl_cluster/tasks/control-servers-1.yml diff --git a/plugins/odl_cluster/tasks/control-servers-2.yml b/plugins/odl_cluster/roles/odl_cluster/tasks/control-servers-2.yml similarity index 100% rename from plugins/odl_cluster/tasks/control-servers-2.yml rename to plugins/odl_cluster/roles/odl_cluster/tasks/control-servers-2.yml diff --git a/plugins/odl_cluster/tasks/control-servers-3.yml b/plugins/odl_cluster/roles/odl_cluster/tasks/control-servers-3.yml similarity index 100% rename from plugins/odl_cluster/tasks/control-servers-3.yml rename to plugins/odl_cluster/roles/odl_cluster/tasks/control-servers-3.yml diff --git a/plugins/odl_cluster/tasks/main.yml b/plugins/odl_cluster/roles/odl_cluster/tasks/main.yml similarity index 100% rename from plugins/odl_cluster/tasks/main.yml rename to plugins/odl_cluster/roles/odl_cluster/tasks/main.yml diff --git a/plugins/odl_cluster/tasks/odl-post.yml b/plugins/odl_cluster/roles/odl_cluster/tasks/odl-post.yml similarity index 100% rename from plugins/odl_cluster/tasks/odl-post.yml rename to plugins/odl_cluster/roles/odl_cluster/tasks/odl-post.yml diff --git a/plugins/odl_cluster/templates/acl_conf.sh b/plugins/odl_cluster/roles/odl_cluster/templates/acl_conf.sh similarity index 100% rename from plugins/odl_cluster/templates/acl_conf.sh rename to plugins/odl_cluster/roles/odl_cluster/templates/acl_conf.sh diff --git a/plugins/odl_cluster/templates/custom.properties b/plugins/odl_cluster/roles/odl_cluster/templates/custom.properties similarity index 100% rename from plugins/odl_cluster/templates/custom.properties rename to plugins/odl_cluster/roles/odl_cluster/templates/custom.properties diff --git a/plugins/odl_cluster/templates/ml2_conf.sh b/plugins/odl_cluster/roles/odl_cluster/templates/ml2_conf.sh similarity index 100% rename from plugins/odl_cluster/templates/ml2_conf.sh rename to plugins/odl_cluster/roles/odl_cluster/templates/ml2_conf.sh diff --git a/plugins/odl_cluster/templates/org.apache.karaf.features.cfg b/plugins/odl_cluster/roles/odl_cluster/templates/org.apache.karaf.features.cfg similarity index 100% rename from plugins/odl_cluster/templates/org.apache.karaf.features.cfg rename to plugins/odl_cluster/roles/odl_cluster/templates/org.apache.karaf.features.cfg diff --git a/plugins/odl_cluster/vars/Debian.yml b/plugins/odl_cluster/roles/odl_cluster/vars/Debian.yml similarity index 100% rename from plugins/odl_cluster/vars/Debian.yml rename to plugins/odl_cluster/roles/odl_cluster/vars/Debian.yml diff --git a/plugins/odl_cluster/vars/RedHat.yml b/plugins/odl_cluster/roles/odl_cluster/vars/RedHat.yml similarity index 100% rename from plugins/odl_cluster/vars/RedHat.yml rename to plugins/odl_cluster/roles/odl_cluster/vars/RedHat.yml diff --git a/plugins/odl_cluster/vars/main.yml b/plugins/odl_cluster/roles/odl_cluster/vars/main.yml similarity index 100% rename from plugins/odl_cluster/vars/main.yml rename to plugins/odl_cluster/roles/odl_cluster/vars/main.yml 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/deploy/adapters/ansible/roles/config-osa/templates/setup-odl.yml.j2 b/plugins/odl_cluster/roles/setup-opendaylight/templates/setup-odl.yml.j2 similarity index 100% rename from deploy/adapters/ansible/roles/config-osa/templates/setup-odl.yml.j2 rename to plugins/odl_cluster/roles/setup-opendaylight/templates/setup-odl.yml.j2 diff --git a/plugins/rt_kvm/tasks/kvm.yml b/plugins/rt_kvm/roles/rt_kvm/tasks/kvm.yml similarity index 100% rename from plugins/rt_kvm/tasks/kvm.yml rename to plugins/rt_kvm/roles/rt_kvm/tasks/kvm.yml diff --git a/plugins/rt_kvm/tasks/main.yml b/plugins/rt_kvm/roles/rt_kvm/tasks/main.yml similarity index 100% rename from plugins/rt_kvm/tasks/main.yml rename to plugins/rt_kvm/roles/rt_kvm/tasks/main.yml diff --git a/plugins/rt_kvm/vars/main.yml b/plugins/rt_kvm/roles/rt_kvm/vars/main.yml similarity index 100% rename from plugins/rt_kvm/vars/main.yml rename to plugins/rt_kvm/roles/rt_kvm/vars/main.yml -- 2.16.6