From e911fcf505d769a500f028abdedf2ef45faa10b2 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Thu, 12 Jul 2018 20:48:52 +0100 Subject: [PATCH] Execute service setup against a delegated host using Ansible built-in modules In order to reduce the packages required to pip install on to the hosts, we allow the service setup to be delegated to a specific host, defaulting to the deploy host. We also switch as many tasks as possible to using the built-in Ansible modules which make use of the shade library. The 'virtualenv' package is now installed appropriately by the openstack_hosts role, so there's no need to install it any more. The 'httplib2' package is a legacy Ansible requirement for the get_url/get_uri module which is no longer needed. The keystone client library is not required any more now that we're using the upstream modules. As there are no required packages left, the task to install them is also removed. Change-Id: Ia6c57495b8d6090a0b98f17554288a310388c3e2 --- defaults/main.yml | 10 +- meta/main.yml | 1 - tasks/tacker_install.yml | 13 --- tasks/tacker_service_setup.yml | 152 +++++++++++++++---------------- tests/host_vars/localhost.yml | 2 - tests/test-install-tacker.yml | 3 +- tests/test-tacker-functional.yml | 4 +- 7 files changed, 82 insertions(+), 103 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index b890e17..122837a 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -20,6 +20,11 @@ debug: False verbose: True +# Set the host which will execute the shade modules +# for the service setup. The host must already have +# clouds.yaml properly configured. +tacker_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}" + # Set the package install state for distribution packages # Options are 'present' and 'latest' tacker_package_state: "latest" @@ -106,11 +111,6 @@ tacker_keystone_auth_plugin: password tacker_service_in_ldap: false -# packages that must be installed before anything else -tacker_requires_pip_packages: - - virtualenv - - python-keystoneclient # Keystoneclient needed to OSA keystone lib - ## Common pip packages tacker_pip_packages: - mysql-python diff --git a/meta/main.yml b/meta/main.yml index f85d1a3..016ab68 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -40,4 +40,3 @@ dependencies: when: - ansible_pkg_mgr == 'apt' - galera_client - - openstack_openrc diff --git a/tasks/tacker_install.yml b/tasks/tacker_install.yml index 3d985dc..440ab96 100644 --- a/tasks/tacker_install.yml +++ b/tasks/tacker_install.yml @@ -36,19 +36,6 @@ when: - tacker_developer_mode | bool -- name: Install requires pip packages - pip: - name: "{{ tacker_requires_pip_packages }}" - state: "{{ tacker_pip_package_state }}" - extra_args: >- - {{ tacker_developer_mode | ternary(pip_install_developer_constraints | default('--constraint /opt/developer-pip-constraints.txt'), '') }} - {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }} - {{ pip_install_options | default('') }} - register: install_packages - until: install_packages is success - retries: 5 - delay: 2 - - name: Retrieve checksum for venv download uri: url: "{{ tacker_venv_download_url | replace('tgz', 'checksum') }}" diff --git a/tasks/tacker_service_setup.yml b/tasks/tacker_service_setup.yml index 3fed270..06ccacc 100644 --- a/tasks/tacker_service_setup.yml +++ b/tasks/tacker_service_setup.yml @@ -15,83 +15,81 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Create a service -- name: Ensure tacker service - keystone: - command: "ensure_service" - endpoint: "{{ keystone_service_adminurl }}" - login_user: "{{ keystone_admin_user_name }}" - login_password: "{{ keystone_auth_admin_password }}" - login_project_name: "{{ keystone_admin_tenant_name }}" - service_name: "{{ tacker_service_name }}" - service_type: "{{ tacker_service_type }}" - description: "{{ tacker_service_description }}" - insecure: "{{ keystone_service_adminuri_insecure }}" - register: add_service - until: add_service is success - retries: 5 - delay: 2 - no_log: True +# We set the python interpreter to the ansible runtime venv if +# the delegation is to localhost so that we get access to the +# appropriate python libraries in that venv. If the delegation +# is to another host, we assume that it is accessible by the +# system python instead. +- name: Setup the service + delegate_to: "{{ tacker_service_setup_host }}" + vars: + ansible_python_interpreter: >- + {{ (tacker_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable']) }} + block: + - name: Add service to the keystone service catalog + os_keystone_service: + cloud: default + state: present + name: "{{ tacker_service_name }}" + service_type: "{{ tacker_service_type }}" + description: "{{ tacker_service_description }}" + endpoint_type: admin + verify: "{{ not keystone_service_adminuri_insecure }}" + register: add_service + until: add_service is success + retries: 5 + delay: 10 -# Create an admin user -- name: Ensure tacker user - keystone: - command: "ensure_user" - endpoint: "{{ keystone_service_adminurl }}" - login_user: "{{ keystone_admin_user_name }}" - login_password: "{{ keystone_auth_admin_password }}" - login_project_name: "{{ keystone_admin_tenant_name }}" - user_name: "{{ tacker_service_user_name }}" - tenant_name: "{{ tacker_service_project_name }}" - password: "{{ tacker_service_password }}" - insecure: "{{ keystone_service_adminuri_insecure }}" - register: add_service - when: not tacker_service_in_ldap | bool - until: add_service is success - retries: 5 - delay: 10 - no_log: True + - name: Add service user + os_user: + cloud: default + state: present + name: "{{ tacker_service_user_name }}" + password: "{{ tacker_service_password }}" + domain: default + default_project: "{{ tacker_service_project_name }}" + endpoint_type: admin + verify: "{{ not keystone_service_adminuri_insecure }}" + register: add_service + when: not tacker_service_in_ldap | bool + until: add_service is success + retries: 5 + delay: 10 + no_log: True -# Add a role to the user -- name: Ensure tacker user to admin role - keystone: - command: "ensure_user_role" - endpoint: "{{ keystone_service_adminurl }}" - login_user: "{{ keystone_admin_user_name }}" - login_password: "{{ keystone_auth_admin_password }}" - login_project_name: "{{ keystone_admin_tenant_name }}" - user_name: "{{ tacker_service_user_name }}" - tenant_name: "{{ tacker_service_project_name }}" - role_name: "{{ tacker_role_name }}" - insecure: "{{ keystone_service_adminuri_insecure }}" - register: add_service - when: not tacker_service_in_ldap | bool - until: add_service is success - retries: 5 - delay: 10 - no_log: True + - name: Add service user to admin role + os_user_role: + cloud: default + state: present + user: "{{ tacker_service_user_name }}" + role: "{{ tacker_role_name }}" + project: "{{ tacker_service_project_name }}" + endpoint_type: admin + verify: "{{ not keystone_service_adminuri_insecure }}" + register: add_service + when: not tacker_service_in_ldap | bool + until: add_service is success + retries: 5 + delay: 10 -# Create an endpoint -- name: Ensure tacker endpoint - keystone: - command: "ensure_endpoint" - endpoint: "{{ keystone_service_adminurl }}" - login_user: "{{ keystone_admin_user_name }}" - login_password: "{{ keystone_auth_admin_password }}" - login_project_name: "{{ keystone_admin_tenant_name }}" - region_name: "{{ tacker_service_region }}" - service_name: "{{ tacker_service_name }}" - service_type: "{{ tacker_service_type }}" - insecure: "{{ keystone_service_adminuri_insecure }}" - endpoint_list: - - url: "{{ tacker_service_publicurl }}" - interface: "public" - - url: "{{ tacker_service_internalurl }}" - interface: "internal" - - url: "{{ tacker_service_adminurl }}" - interface: "admin" - register: add_service - until: add_service is success - retries: 5 - delay: 10 - no_log: True + - name: Add endpoints to keystone endpoint catalog + os_keystone_endpoint: + cloud: default + state: present + service: "{{ tacker_service_name }}" + endpoint_interface: "{{ item.interface }}" + url: "{{ item.url }}" + region: "{{ tacker_service_region }}" + endpoint_type: admin + verify: "{{ not keystone_service_adminuri_insecure }}" + register: add_service + until: add_service is success + retries: 5 + delay: 10 + with_items: + - interface: "public" + url: "{{ tacker_service_publicurl }}" + - interface: "internal" + url: "{{ tacker_service_internalurl }}" + - interface: "admin" + url: "{{ tacker_service_adminurl }}" diff --git a/tests/host_vars/localhost.yml b/tests/host_vars/localhost.yml index 65ddeaa..6c26f31 100644 --- a/tests/host_vars/localhost.yml +++ b/tests/host_vars/localhost.yml @@ -15,5 +15,3 @@ bridges: - "br-mgmt" - -ansible_python_interpreter: "/usr/bin/python2" diff --git a/tests/test-install-tacker.yml b/tests/test-install-tacker.yml index e050f69..df540e5 100644 --- a/tests/test-install-tacker.yml +++ b/tests/test-install-tacker.yml @@ -15,8 +15,7 @@ - name: Playbook for deploying tacker hosts: tacker_all - user: root - become: true + remote_user: root gather_facts: true any_errors_fatal: true pre_tasks: diff --git a/tests/test-tacker-functional.yml b/tests/test-tacker-functional.yml index 5eee422..71dc64c 100644 --- a/tests/test-tacker-functional.yml +++ b/tests/test-tacker-functional.yml @@ -20,11 +20,9 @@ tasks: - name: check tacker api uri: - url: "http://localhost:{{ item }}" + url: "http://localhost:9890" status_code: 200 register: result until: result.status == 200 retries: 5 delay: 10 - with_items: - - 9890