diff options
| author |   Fatih Degirmenci <fdegir@gmail.com> | 2018-03-12 14:34:18 +0100 |
|---|---|---|
| committer | Fatih Degirmenci <fdegir@gmail.com> | 2018-03-12 13:44:03 +0000 |
| commit | 797efff8b6772b606f65822fbae6edfda35be0d2 (patch) | |
| tree | 28e435f0e9d8150451d225c626c151d6e914456b /xci/playbooks/configure-localhost.yml | |
| parent | cea2e3355bc6b5c059349c6c3ca2e96d214cbfb4 (diff) | |
Combine vars setting installer type in INSTALLER_TYPE
Change-Id: I330bc036f901d4ba61bc94ee6e085cadf54b4d8b
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
Diffstat (limited to 'xci/playbooks/configure-localhost.yml')
| -rw-r--r-- | xci/playbooks/configure-localhost.yml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xci/playbooks/configure-localhost.yml b/xci/playbooks/configure-localhost.yml index 467ab312..a5b0e3fa 100644 --- a/xci/playbooks/configure-localhost.yml +++ b/xci/playbooks/configure-localhost.yml @@ -35,33 +35,33 @@ repo: "{{ OPENSTACK_OSA_OPENRC_GIT_URL }}" dest: roles/openstack-ansible-openstack_openrc version: "master" - when: XCI_INSTALLER == "osa" + when: INSTALLER_TYPE == "osa" - role: clone-repository project: "openstack/openstack-ansible" repo: "{{ OPENSTACK_OSA_GIT_URL }}" dest: "{{ XCI_CACHE }}/repos/openstack-ansible" version: "{{ OPENSTACK_OSA_VERSION }}" - when: XCI_INSTALLER == "osa" + when: INSTALLER_TYPE == "osa" - role: clone-repository project: "kubernetes-incubator/kubespray" repo: "{{ KUBESPRAY_GIT_URL }}" dest: "{{ XCI_CACHE }}/repos/kubespray" version: "{{ KUBESPRAY_VERSION }}" - when: XCI_INSTALLER == "kubespray" + when: INSTALLER_TYPE == "kubespray" - role: clone-repository project: "openstack/openstack-ansible-haproxy_server" repo: "{{ OPENSTACK_OSA_HAPROXY_GIT_URL }}" dest: roles/haproxy_server version: "{{ HAPROXY_VERSION }}" when: - - XCI_INSTALLER == "kubespray" + - INSTALLER_TYPE == "kubespray" - role: clone-repository project: "ansible-keepalived" repo: "{{ KEEPALIVED_GIT_URL }}" dest: roles/keepalived version: "{{ KEEPALIVED_VERSION }}" when: - - XCI_INSTALLER == "kubespray" + - INSTALLER_TYPE == "kubespray" tasks: - name: create log directory {{LOG_PATH}} @@ -97,4 +97,4 @@ when: - OPENSTACK_OSA_DEV_PATH != "" when: - - XCI_INSTALLER == "osa" + - INSTALLER_TYPE == "osa" |