openstack/kayobe
Code Issues Proposed changes

Remove support for colocated kolla & kolla-ansible

Browse Source 
Kolla-ansible python code was moved to the kolla-ansible repo in ocata.
This commit is contained in:
Mark Goddard
2017-11-20 09:10:45 +00:00
parent 3381d4237e
commit c818758260
2 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/roles/kolla-ansible/tasks/main.yml
View File

@@ -1,6 +1,5 @@
--- ---
- include: install.yml - include: install.yml
when: kolla_ansible_is_standalone | bool
tags: tags:
- install - install

8
ansible/roles/kolla-ansible/vars/main.yml
View File

@@ -1,12 +1,6 @@
--- ---
# kolla-ansible was bundled with kolla prior to Ocata (4.0.0).
kolla_ansible_is_standalone: "{{ kolla_ansible_source_version | version_compare('4.0.0', '>=') }}"
# Name of the kolla-ansible python module.
kolla_ansible_module: "{% if kolla_ansible_is_standalone | bool %}kolla-ansible{% else %}kolla{% endif %}"
# Path to Kolla Ansible installation directory. # Path to Kolla Ansible installation directory.
kolla_ansible_install_dir: "{{ kolla_ansible_venv }}/share/{{ kolla_ansible_module }}" kolla_ansible_install_dir: "{{ kolla_ansible_venv }}/share/kolla-ansible"
############################################################################### ###############################################################################
# Inventory configuration. # Inventory configuration.