12 files changed, 7 insertions, 6 deletions
diff --git a/xci/playbooks/roles/bootstrap-host/tasks/network.yml b/xci/playbooks/roles/bootstrap-host/tasks/network.yml
index 92e9195e..723db48d 100644
--- a/xci/playbooks/roles/bootstrap-host/tasks/network.yml
+++ b/xci/playbooks/roles/bootstrap-host/tasks/network.yml
@@ -70,7 +70,7 @@
         - directory
     - name: ensure interfaces file is updated
       template:
-        src: "{{ ansible_os_family | lower }}/{{ ansible_hostname }}.interface.j2"
+        src: "{{ installer_type }}/{{ ansible_os_family | lower }}/{{ ansible_hostname }}.interface.j2"
         dest: "/etc/network/interfaces"
     - name: restart network service
       shell: "/sbin/ifconfig {{ ansible_local.xci.network.xci_interface }} 0 && /sbin/ifdown -a && /sbin/ifup -a"
@@ -81,7 +81,7 @@
 - block:
     - name: Configure networking on SUSE
       template:
-        src: "{{ ansible_os_family | lower }}/suse.interface.j2"
+        src: "{{ installer_type }}/{{ ansible_os_family | lower }}/suse.interface.j2"
         dest: "/etc/sysconfig/network/ifcfg-{{ item.name }}"
       with_items:
         - { name: "{{ ansible_local.xci.network.xci_interface }}" }
@@ -101,7 +101,7 @@
 
     - name: Configure routes on SUSE
       template:
-        src: "{{ ansible_os_family | lower }}/suse.routes.j2"
+        src: "{{ installer_type }}/{{ ansible_os_family | lower }}/suse.routes.j2"
         dest: "/etc/sysconfig/network/ifroute-{{ item.name }}"
       with_items:
         - { name: "br-vlan", gateway: "192.168.122.1", route: "default" }
@@ -116,7 +116,7 @@
 - block:
     - name: Configure networking on CentOS for interfaces
       template:
-        src: "{{ ansible_os_family | lower }}/interface.ifcfg.j2"
+        src: "{{ installer_type }}/{{ ansible_os_family | lower }}/interface.ifcfg.j2"
         dest: "/etc/sysconfig/network-scripts/ifcfg-{{ item.name }}"
       with_items:
         - { name: "{{ ansible_local.xci.network.xci_interface }}"   , bridge: "br-vlan"                 }
@@ -125,7 +125,7 @@
         - { name: "{{ ansible_local.xci.network.xci_interface }}.30", bridge: "br-vxlan"  , vlan_id: 30 }
     - name: Configure networking on CentOS for bridges
       template:
-        src: "{{ ansible_os_family | lower }}/bridge.ifcfg.j2"
+        src: "{{ installer_type }}/{{ ansible_os_family | lower }}/bridge.ifcfg.j2"
         dest: "/etc/sysconfig/network-scripts/ifcfg-{{ item.name }}"
       with_items:
         - { name: "br-vlan"   , ip: "{{ host_info[inventory_hostname].VLAN_IP }}",    prefix: 24 }
diff --git a/xci/playbooks/roles/bootstrap-host/templates/debian/compute00.interface.j2 b/xci/playbooks/roles/bootstrap-host/templates/osa/debian/compute00.interface.j2
index 2da12f20..2da12f20 100644
--- a/xci/playbooks/roles/bootstrap-host/templates/debian/compute00.interface.j2
+++ b/xci/playbooks/roles/bootstrap-host/templates/osa/debian/compute00.interface.j2
diff --git a/xci/playbooks/roles/bootstrap-host/templates/debian/compute01.interface.j2 b/xci/playbooks/roles/bootstrap-host/templates/osa/debian/compute01.interface.j2
index a74df1c2..a74df1c2 120000
--- a/xci/playbooks/roles/bootstrap-host/templates/debian/compute01.interface.j2
+++ b/xci/playbooks/roles/bootstrap-host/templates/osa/debian/compute01.interface.j2
diff --git a/xci/playbooks/roles/bootstrap-host/templates/debian/controller00.interface.j2 b/xci/playbooks/roles/bootstrap-host/templates/osa/debian/controller00.interface.j2
index c540f66e..c540f66e 100644
--- a/xci/playbooks/roles/bootstrap-host/templates/debian/controller00.interface.j2
+++ b/xci/playbooks/roles/bootstrap-host/templates/osa/debian/controller00.interface.j2
diff --git a/xci/playbooks/roles/bootstrap-host/templates/debian/controller01.interface.j2 b/xci/playbooks/roles/bootstrap-host/templates/osa/debian/controller01.interface.j2
index e835d7ca..e835d7ca 120000
--- a/xci/playbooks/roles/bootstrap-host/templates/debian/controller01.interface.j2
+++ b/xci/playbooks/roles/bootstrap-host/templates/osa/debian/controller01.interface.j2
diff --git a/xci/playbooks/roles/bootstrap-host/templates/debian/controller02.interface.j2 b/xci/playbooks/roles/bootstrap-host/templates/osa/debian/controller02.interface.j2
index e835d7ca..e835d7ca 120000
--- a/xci/playbooks/roles/bootstrap-host/templates/debian/controller02.interface.j2
+++ b/xci/playbooks/roles/bootstrap-host/templates/osa/debian/controller02.interface.j2
diff --git a/xci/playbooks/roles/bootstrap-host/templates/debian/opnfv.interface.j2 b/xci/playbooks/roles/bootstrap-host/templates/osa/debian/opnfv.interface.j2
index 03f81dbb..03f81dbb 100644
--- a/xci/playbooks/roles/bootstrap-host/templates/debian/opnfv.interface.j2
+++ b/xci/playbooks/roles/bootstrap-host/templates/osa/debian/opnfv.interface.j2
diff --git a/xci/playbooks/roles/bootstrap-host/templates/redhat/bridge.ifcfg.j2 b/xci/playbooks/roles/bootstrap-host/templates/osa/redhat/bridge.ifcfg.j2
index 06b5f177..06b5f177 100644
--- a/xci/playbooks/roles/bootstrap-host/templates/redhat/bridge.ifcfg.j2
+++ b/xci/playbooks/roles/bootstrap-host/templates/osa/redhat/bridge.ifcfg.j2
diff --git a/xci/playbooks/roles/bootstrap-host/templates/redhat/interface.ifcfg.j2 b/xci/playbooks/roles/bootstrap-host/templates/osa/redhat/interface.ifcfg.j2
index a97ad0cf..a97ad0cf 100644
--- a/xci/playbooks/roles/bootstrap-host/templates/redhat/interface.ifcfg.j2
+++ b/xci/playbooks/roles/bootstrap-host/templates/osa/redhat/interface.ifcfg.j2
diff --git a/xci/playbooks/roles/bootstrap-host/templates/suse/suse.interface.j2 b/xci/playbooks/roles/bootstrap-host/templates/osa/suse/suse.interface.j2
index 27b01eb4..27b01eb4 100644
--- a/xci/playbooks/roles/bootstrap-host/templates/suse/suse.interface.j2
+++ b/xci/playbooks/roles/bootstrap-host/templates/osa/suse/suse.interface.j2
diff --git a/xci/playbooks/roles/bootstrap-host/templates/suse/suse.routes.j2 b/xci/playbooks/roles/bootstrap-host/templates/osa/suse/suse.routes.j2
index 7c868447..7c868447 100644
--- a/xci/playbooks/roles/bootstrap-host/templates/suse/suse.routes.j2
+++ b/xci/playbooks/roles/bootstrap-host/templates/osa/suse/suse.routes.j2
diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh
index a8b7adbd..c0c1a8ef 100755
--- a/xci/xci-deploy.sh
+++ b/xci/xci-deploy.sh
@@ -153,7 +153,8 @@ echo "-------------------------------------------------------------------------"
 #-------------------------------------------------------------------------------
 # Get scenario variables overrides
 #-------------------------------------------------------------------------------
-source $(find $XCI_SCENARIOS_CACHE/${DEPLOY_SCENARIO} -name xci_overrides) &>/dev/null || :
+source $(find $XCI_PATH/xci/scenarios/${DEPLOY_SCENARIO} -name xci_overrides) &>/dev/null || \
+    source $(find $XCI_SCENARIOS_CACHE/${DEPLOY_SCENARIO} -name xci_overrides) &>/dev/null || :
 
 # Deploy infrastructure based on the selected deloyment method
 echo "Info: Deploying hardware using '${INFRA_DEPLOYMENT}'"