Combine vars setting installer type in INSTALLER_TYPE

Change-Id: Ie196d1df537d09f0f91e43ab5e0305a45d543815
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>

diff --git a/xci/installer/kubespray/README b/xci/installer/kubespray/README
index 171091e..04202c2 100644 (file)
--- a/xci/installer/kubespray/README
+++ b/xci/installer/kubespray/README
@@ -55,7 +55,7 @@ Change into the directory where the sandbox script is located
 
 Set the variable to run kubespray
 
-    export XCI_INSTALLER=kubespray
+    export INSTALLER_TYPE=kubespray
     export DEPLOY_SCENARIO=k8-nosdn-nofeature
     export XCI_FLAVOR=mini
 

diff --git a/xci/installer/kubespray/playbooks/configure-opnfvhost.yml b/xci/installer/kubespray/playbooks/configure-opnfvhost.yml
index 9fb4da1..4db9ac1 100644 (file)
--- a/xci/installer/kubespray/playbooks/configure-opnfvhost.yml
+++ b/xci/installer/kubespray/playbooks/configure-opnfvhost.yml
@@ -20,7 +20,7 @@
     - name: Set facts for remote deployment
       set_fact:
         remote_xci_path: "{{ ansible_env.HOME }}/releng-xci"
-        remote_xci_flavor_files: "{{ ansible_env.HOME }}/releng-xci/xci/installer/{{ XCI_INSTALLER }}/files/{{ XCI_FLAVOR }}"
+        remote_xci_flavor_files: "{{ ansible_env.HOME }}/releng-xci/xci/installer/{{ INSTALLER_TYPE }}/files/{{ XCI_FLAVOR }}"
         remote_xci_playbooks: "{{ ansible_env.HOME }}/releng-xci/xci/playbooks"
 
     - name: Copy releng-xci to remote host