From 0fe066df1ec07d485f5d510e5cec5b7a082dcb58 Mon Sep 17 00:00:00 2001 From: Yifei Xue Date: Thu, 15 Mar 2018 17:19:47 +0800 Subject: Copy ml2_conf.ini to ODL hosts JIRA: - SFC test cases in functest need to read ml2_conf.ini to get ODL controller's IP and port. However they can only gei this file from control nodes. So we copy this from neutron server containers to ODL hosts. Change-Id: I21acbaed6de924247d249d6c4015d9f90c763a08 Signed-off-by: Yifei Xue --- .../roles/setup-odl-sfc/tasks/control-servers-3.yml | 7 +++++++ plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-post.yml | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-3.yml b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-3.yml index c4451ca2..1eb68871 100755 --- a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-3.yml +++ b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-3.yml @@ -26,3 +26,10 @@ become: "yes" become_user: "neutron" when: odl_sfc == "Enable" + +- name: fetch ml2_conf.ini to compass-tasks + fetch: + src: /etc/neutron/plugins/ml2/ml2_conf.ini + dest: /tmp/ + flat: "yes" + when: odl_sfc == "Enable" diff --git a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-post.yml b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-post.yml index 9f1cb79e..55b0e160 100755 --- a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-post.yml +++ b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-post.yml @@ -32,3 +32,21 @@ - name: restart opendaylight shell: sleep 60; service opendaylight restart; sleep 60; when: inventory_hostname in groups['network_hosts'] + +- name: creat ml2 directory on ODL hosts + file: + path: /etc/neutron/plugins/ml2/ + state: directory + mode: 0755 + when: + - inventory_hostname in groups['network_hosts'] + - odl_sfc == "Enable" + +- name: copy ml2_conf.ini to ODL hosts + copy: + src: /tmp/ml2_conf.ini + dest: /etc/neutron/plugins/ml2/ml2_conf.ini + mode: 0755 + when: + - inventory_hostname in groups['network_hosts'] + - odl_sfc == "Enable" -- cgit 1.2.3-korg