7 files changed, 6 insertions, 17 deletions
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/README b/scenarios/os-odl-sfc/role/os-odl-sfc/README
deleted file mode 100644
index a7461ec8..00000000
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/README
+++ /dev/null
@@ -1,11 +0,0 @@
-This is the role which deploys the os-odl-sfc scenarios in xci.
-
-This role currently works with:
-
-- OpenStack stable/queens
-- ODL Oxygen
-- OVS+NSH patch
-- OpenSUSE 42.3 or Ubuntu 16.04
-
-Follow this link:
-https://wiki.opnfv.org/display/sfc/Deploy+OPNFV+SFC+scenarios
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/ha/openstack_user_config.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/ha/openstack_user_config.yml
index 838ea46c..838ea46c 100644
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/ha/openstack_user_config.yml
+++ b/scenarios/os-odl-sfc/role/os-odl-sfc/files/ha/openstack_user_config.yml
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/mini/openstack_user_config.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/mini/openstack_user_config.yml
index 48ce06e9..48ce06e9 100644
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/mini/openstack_user_config.yml
+++ b/scenarios/os-odl-sfc/role/os-odl-sfc/files/mini/openstack_user_config.yml
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/noha/openstack_user_config.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/noha/openstack_user_config.yml
index 5caed125..5caed125 100644
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/noha/openstack_user_config.yml
+++ b/scenarios/os-odl-sfc/role/os-odl-sfc/files/noha/openstack_user_config.yml
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-files-master.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-config-files.yml
index fbaa7301..5d677d1c 100644
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-files-master.yml
+++ b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-config-files.yml
@@ -13,8 +13,8 @@
     dest: "{{openstack_osa_etc_path}}/user_sfc_scenarios_variables.yml"
   when: ansible_pkg_mgr == 'apt'
 
-# To get the mano_host variable (can only be defined here for the inventory)
+# To get the mano_host & metering-infra_hosts variable for inventory
 - name: copy openstack_user_config.yml
   copy:
-    src: "tacker_files/{{xci_flavor}}/openstack_user_config.yml"
+    src: "{{xci_flavor}}/openstack_user_config.yml"
     dest: "{{openstack_osa_etc_path}}/openstack_user_config.yml"
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/main.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/main.yml
index 270f6019..f3b4e736 100644
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/main.yml
+++ b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/main.yml
@@ -8,5 +8,5 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-- name: Copy the OSA not-yet-upstreamed files for master
-  include: copy-OSA-files-master.yml
+- name: Copy the OSA config files
+  include: copy-OSA-config-files.yml
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/post-deployment.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/post-deployment.yml
index cc6c47ff..837a8ee3 100644
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/post-deployment.yml
+++ b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/post-deployment.yml
@@ -10,8 +10,8 @@
 - name: "Fetch the ip of the neutron server container"
   shell: 'grep controller00_neutron_server_container -n1 /etc/openstack_deploy/openstack_inventory.json | grep ansible_host | cut -d":" -f2 | cut -d "\"" -f2'
   register: ip
-  when: "'odl' in deploy_scenario"
+  change_when: False
 
 - name: Fetch the ml2_conf.ini to process ODL variables
   command: "scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no {{ ip.stdout }}:/etc/neutron/plugins/ml2/ml2_conf.ini /tmp/ml2_conf.ini"
-  when: "'odl' in deploy_scenario"
+  change_when: False