summaryrefslogtreecommitdiffstats
path: root/xci/installer
diff options
context:
space:
mode:
authorFatih Degirmenci <fdegir@gmail.com>2018-03-12 18:02:33 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-03-12 18:02:33 +0000
commitc6ea45f88ce8c11e7b0e35b6d1c8cf233ebd556c (patch)
tree06ce9df12afd66c1b7017f53723ca1075c6e66ea /xci/installer
parent6e31d2ad9e59a4a7b39fcd1e5cf21369a10fceb6 (diff)
parentd36c96a8907f56bfccf7cfd95d4e7ddcf2dcb6ff (diff)
Merge "Combine vars setting installer type in INSTALLER_TYPE"
Diffstat (limited to 'xci/installer')
-rw-r--r--xci/installer/kubespray/README2
-rw-r--r--xci/installer/kubespray/playbooks/configure-opnfvhost.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/xci/installer/kubespray/README b/xci/installer/kubespray/README
index 171091e8..04202c28 100644
--- 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 9fb4da19..4db9ac1a 100644
--- 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