From c8187582607473f8a8b5f0eed9631c2be2f357ec Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Mon, 20 Nov 2017 09:10:45 +0000 Subject: [PATCH] Remove support for colocated kolla & kolla-ansible Kolla-ansible python code was moved to the kolla-ansible repo in ocata. --- ansible/roles/kolla-ansible/tasks/main.yml | 1 - ansible/roles/kolla-ansible/vars/main.yml | 8 +------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/ansible/roles/kolla-ansible/tasks/main.yml b/ansible/roles/kolla-ansible/tasks/main.yml index 54bf9286a..969f7a192 100644 --- a/ansible/roles/kolla-ansible/tasks/main.yml +++ b/ansible/roles/kolla-ansible/tasks/main.yml @@ -1,6 +1,5 @@ --- - include: install.yml - when: kolla_ansible_is_standalone | bool tags: - install diff --git a/ansible/roles/kolla-ansible/vars/main.yml b/ansible/roles/kolla-ansible/vars/main.yml index f612a0161..4d963c18f 100644 --- a/ansible/roles/kolla-ansible/vars/main.yml +++ b/ansible/roles/kolla-ansible/vars/main.yml @@ -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. -kolla_ansible_install_dir: "{{ kolla_ansible_venv }}/share/{{ kolla_ansible_module }}" +kolla_ansible_install_dir: "{{ kolla_ansible_venv }}/share/kolla-ansible" ############################################################################### # Inventory configuration.