From: Fatih Degirmenci Date: Mon, 12 Mar 2018 13:35:22 +0000 (+0100) Subject: Combine vars setting installer type in INSTALLER_TYPE X-Git-Tag: 6.0.0~118^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=d36c96a8907f56bfccf7cfd95d4e7ddcf2dcb6ff;p=releng-xci.git Combine vars setting installer type in INSTALLER_TYPE Change-Id: Ie196d1df537d09f0f91e43ab5e0305a45d543815 Signed-off-by: Fatih Degirmenci --- 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