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: I9ce106569ced891c551b36506d360e4b8718c7e3
This commit is contained in:
Jesse Pretorius 2018-07-12 21:26:58 +01:00 committed by Jesse Pretorius (odyssey4me)
parent 1b03c3debe
commit ad2d239eb4
6 changed files with 110 additions and 128 deletions

View File

@ -17,6 +17,11 @@
# (c) 2016 Donovan Francesco <donovan.francesco@is.co.za>
# (c) 2016 Paul Stevens <paul.stevens@is.co.za>
# Set the host which will execute the shade modules
# for the service setup. The host must already have
# clouds.yaml properly configured.
trove_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}"
trove_package_state: "latest"
trove_pip_package_state: "latest"
@ -200,14 +205,6 @@ trove_service_user_domain_id: default
#Glance images
trove_glance_images: []
trove_requires_pip_packages:
- httplib2
- python-glanceclient
- python-keystoneclient
- virtualenv
- shade
- futures
trove_pip_packages:
- cryptography
- MySQL-python

View File

@ -24,4 +24,3 @@ dependencies:
when:
- ansible_pkg_mgr == 'apt'
- galera_client
- openstack_openrc

View File

@ -0,0 +1,17 @@
---
features:
- |
The trove service setup in keystone will now be executed
through delegation to the ``trove_service_setup_host`` which,
by default, is ``localhost`` (the deploy host). Deployers can
opt to rather change this to the utility container by implementing
the following override in ``user_variables.yml``.
.. code-block:: yaml
trove_service_setup_host: "{{ groups['utility_all'][0] }}"
deprecations:
- |
The variable ``trove_requires_pip_packages`` is no longer required
and has therefore been removed.

View File

@ -38,19 +38,6 @@
when:
- trove_developer_mode | bool
- name: Install required pip packages
pip:
name: "{{ trove_requires_pip_packages }}"
state: "{{ trove_pip_package_state }}"
extra_args: >-
{{ trove_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: "{{ trove_venv_download_url | replace('tgz', 'checksum') }}"

View File

@ -15,111 +15,95 @@
#
# (c) 2016 Donovan Francesco <donovan.francesco@is.co.za>
# (c) 2016 Paul Stevens <paul.stevens@is.co.za>
# Reference: https://docs.openstack.org/trove/latest/install/manual_install.html
- name: Ensure the trove tenant exists
keystone:
command: "ensure_tenant"
endpoint: "{{ keystone_service_adminurl }}"
login_user: "{{ keystone_admin_user_name }}"
login_password: "{{ keystone_auth_admin_password }}"
login_project_name: "{{ keystone_admin_tenant_name }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
tenant_name: "{{ trove_service_tenant_name }}"
project_name: "{{ trove_service_project_name }}"
description: "{{ trove_service_description }}"
register: add_trove_tenant
until: add_trove_tenant is success
retries: 5
delay: 2
no_log: True
tags:
- trove-api-setup
- trove-service-add
- trove-setup
- name: Ensure the service for trove exists
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 }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
service_name: "{{ trove_service_name }}"
service_type: "{{ trove_service_type }}"
description: "{{ trove_service_description }}"
register: add_trove_service
until: add_trove_service is success
retries: 5
delay: 2
no_log: True
tags:
- trove-api-setup
- trove-service-add
- trove-setup
# 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: "{{ trove_service_setup_host }}"
vars:
ansible_python_interpreter: >-
{{ (trove_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: "{{ trove_service_name }}"
service_type: "{{ trove_service_type }}"
description: "{{ trove_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 the trove admin user exists
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 }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
user_name: "{{ trove_admin_user_name }}"
tenant_name: "{{ trove_service_tenant_name }}"
password: "{{ trove_service_password }}"
project_name: "{{ trove_service_project_name }}"
register: add_trove_admin_user
until: add_trove_admin_user is success
retries: 5
delay: 2
no_log: True
tags:
- trove-api-setup
- trove-service-add
- trove-user-add
- trove-setup
- name: Add service project
os_project:
cloud: default
state: present
name: "{{ trove_service_project_name }}"
description: "{{ trove_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 the trove admin user has the 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: "{{ trove_admin_user_name }}"
tenant_name: "{{ trove_service_tenant_name }}"
role_name: "{{ item }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
project_name: "{{ trove_service_project_name }}"
register: ensure_trove_admin_roles
until: ensure_trove_admin_roles is success
retries: 5
delay: 2
with_items: "{{ trove_service_admin_role_names }}"
no_log: True
- name: Add service user
os_user:
cloud: default
state: present
name: "{{ trove_admin_user_name }}"
password: "{{ trove_service_password }}"
domain: default
default_project: "{{ trove_service_project_name }}"
endpoint_type: admin
verify: "{{ not keystone_service_adminuri_insecure }}"
register: add_service
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: "{{ trove_admin_user_name }}"
role: "{{ item }}"
project: "{{ trove_service_project_name }}"
endpoint_type: admin
verify: "{{ not keystone_service_adminuri_insecure }}"
register: add_service
until: add_service is success
retries: 5
delay: 10
with_items: "{{ trove_service_admin_role_names }}"
- name: Add endpoints to keystone endpoint catalog
os_keystone_endpoint:
cloud: default
state: present
service: "{{ trove_service_name }}"
endpoint_interface: "{{ item.interface }}"
url: "{{ item.url }}"
region: "{{ trove_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: "{{ trove_service_publicurl }}"
- interface: "internal"
url: "{{ trove_service_internalurl }}"
- interface: "admin"
url: "{{ trove_service_adminurl }}"
- name: Ensure the trove endpoint is registered
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 }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
region_name: "{{ trove_service_region }}"
service_name: "{{ trove_service_name }}"
service_type: "{{ trove_service_type }}"
endpoint_list:
- url: "{{ trove_service_publicurl }}"
interface: "public"
- url: "{{ trove_service_internalurl }}"
interface: "internal"
- url: "{{ trove_service_adminurl }}"
interface: "admin"
register: add_trove_endpoints
until: add_trove_endpoints is success
retries: 5
delay: 2
no_log: True

View File

@ -15,5 +15,3 @@
bridges:
- "br-mgmt"
ansible_python_interpreter: "/usr/bin/python2"