From 4bffc1e91f617eb80f9a8488e14f12bb28fdb6fd Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Thu, 12 Jul 2018 21:48:47 +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: I32752523e9ed484bf0864be4db146bb333f9f55e --- defaults/main.yml | 11 ++- meta/main.yml | 1 - tasks/watcher_install.yml | 13 --- tasks/watcher_service_setup.yml | 150 ++++++++++++++++---------------- tests/host_vars/localhost.yml | 2 - 5 files changed, 80 insertions(+), 97 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index a45cda4..8bcd30c 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -16,6 +16,11 @@ ## Verbosity Options debug: False +# Set the host which will execute the shade modules +# for the service setup. The host must already have +# clouds.yaml properly configured. +watcher_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}" + # Set the package install state for distribution and pip packages # Options are 'present' and 'latest' watcher_package_state: "latest" @@ -92,12 +97,6 @@ watcher_service_in_ldap: false ## Keystone authentication middleware watcher_keystone_auth_plugin: password -# watcher packages that must be installed before anything else -watcher_requires_pip_packages: - - virtualenv - - python-keystoneclient # Keystoneclient needed to OSA keystone lib - - httplib2 - # Common pip packages watcher_pip_packages: - cryptography diff --git a/meta/main.yml b/meta/main.yml index 31f1d73..b7ed321 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -35,4 +35,3 @@ dependencies: when: - ansible_pkg_mgr == 'apt' - galera_client - - openstack_openrc diff --git a/tasks/watcher_install.yml b/tasks/watcher_install.yml index b816eeb..0b5c7dd 100644 --- a/tasks/watcher_install.yml +++ b/tasks/watcher_install.yml @@ -27,19 +27,6 @@ when: - watcher_developer_mode | bool -- name: Install requires pip packages - pip: - name: "{{ watcher_requires_pip_packages }}" - state: "{{ watcher_pip_package_state }}" - extra_args: >- - {{ watcher_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: "{{ watcher_venv_download_url | replace('tgz', 'checksum') }}" diff --git a/tasks/watcher_service_setup.yml b/tasks/watcher_service_setup.yml index 06063a3..8a5dbf5 100644 --- a/tasks/watcher_service_setup.yml +++ b/tasks/watcher_service_setup.yml @@ -13,81 +13,81 @@ # See the License for the specific language governing permissions and # limitations under the License. -- name: Ensure watcher 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: "{{ watcher_service_name }}" - service_type: "{{ watcher_service_type }}" - description: "{{ watcher_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: "{{ watcher_service_setup_host }}" + vars: + ansible_python_interpreter: >- + {{ (watcher_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: "{{ watcher_service_name }}" + service_type: "{{ watcher_service_type }}" + description: "{{ watcher_service_description }}" + endpoint_type: admin + verify: "{{ not keystone_service_adminuri_insecure }}" + register: add_service + until: add_service is success + retries: 5 + delay: 10 -- name: Ensure watcher 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: "{{ watcher_service_user_name }}" - tenant_name: "{{ watcher_service_project_name }}" - role_name: "{{ watcher_role_name }}" - password: "{{ watcher_service_password }}" - insecure: "{{ keystone_service_adminuri_insecure }}" - register: add_service - when: not watcher_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: "{{ watcher_service_user_name }}" + password: "{{ watcher_service_password }}" + domain: default + default_project: "{{ watcher_service_project_name }}" + endpoint_type: admin + verify: "{{ not keystone_service_adminuri_insecure }}" + register: add_service + when: not watcher_service_in_ldap | bool + until: add_service is success + retries: 5 + delay: 10 + no_log: True -- name: Ensure watcher 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: "{{ watcher_service_user_name }}" - tenant_name: "{{ watcher_service_project_name }}" - role_name: "{{ watcher_role_name }}" - insecure: "{{ keystone_service_adminuri_insecure }}" - register: add_admin_role - when: not watcher_service_in_ldap | bool - until: add_admin_role is success - retries: 5 - delay: 10 - no_log: true + - name: Add service user to admin role + os_user_role: + cloud: default + state: present + user: "{{ watcher_service_user_name }}" + role: "{{ watcher_role_name }}" + project: "{{ watcher_service_project_name }}" + endpoint_type: admin + verify: "{{ not keystone_service_adminuri_insecure }}" + register: add_service + when: not watcher_service_in_ldap | bool + until: add_service is success + retries: 5 + delay: 10 -# Create an endpoint -- name: Ensure watcher 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: "{{ watcher_service_region }}" - service_name: "{{ watcher_service_name }}" - service_type: "{{ watcher_service_type }}" - insecure: "{{ keystone_service_adminuri_insecure }}" - endpoint_list: - - url: "{{ watcher_service_publicurl }}" - interface: "public" - - url: "{{ watcher_service_adminurl }}" - interface: "admin" - - url: "{{ watcher_service_internalurl }}" - interface: "internal" - 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: "{{ watcher_service_name }}" + endpoint_interface: "{{ item.interface }}" + url: "{{ item.url }}" + region: "{{ watcher_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: "{{ watcher_service_publicurl }}" + - interface: "internal" + url: "{{ watcher_service_internalurl }}" + - interface: "admin" + url: "{{ watcher_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"