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: Ia05fc004e11eada426bc81c45bbc3732b9126bbe
This commit is contained in:
Jesse Pretorius 2018-07-31 12:53:51 +01:00
parent 42087a12b0
commit 30ec2a87f6
5 changed files with 98 additions and 95 deletions

View File

@ -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.
aodh_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}"
# Set the package install state for distribution and pip packages
# Options are 'present' and 'latest'
aodh_package_state: "latest"
@ -118,12 +123,6 @@ aodh_service_adminurl: "{{ aodh_service_adminuri }}"
aodh_service_in_ldap: false
# aodh packages that must be installed before anything else
aodh_requires_pip_packages:
- virtualenv
- python-keystoneclient # Keystoneclient needed to OSA keystone lib
- httplib2
# Common pip packages
aodh_pip_packages:
# The following constraints are taken from the setup.cfg

View File

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

View File

@ -0,0 +1,17 @@
---
features:
- |
The service setup in keystone for aodh will now be executed
through delegation to the ``aodh_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
aodh_service_setup_host: "{{ groups['utility_all'][0] }}"
deprecations:
- |
The variable ``aodh_requires_pip_packages`` is no longer required
and has therefore been removed.

View File

@ -22,19 +22,6 @@
{% endfor %}
when: aodh_developer_mode | bool
- name: Install requires pip packages
pip:
name: "{{ aodh_requires_pip_packages }}"
state: "{{ aodh_pip_package_state }}"
extra_args: >-
{{ aodh_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: "{{ aodh_venv_download_url | replace('tgz', 'checksum') }}"

View File

@ -13,81 +13,82 @@
# See the License for the specific language governing permissions and
# limitations under the License.
- name: Ensure aodh 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: "{{ aodh_service_name }}"
service_type: "{{ aodh_service_type }}"
description: "{{ aodh_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: "{{ aodh_service_setup_host }}"
vars:
ansible_python_interpreter: >-
{{ (aodh_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: "{{ aodh_service_name }}"
service_type: "{{ aodh_service_type }}"
description: "{{ aodh_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 aodh 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: "{{ aodh_service_user_name }}"
tenant_name: "{{ aodh_service_tenant_name }}"
role_name: "{{ aodh_role_name }}"
password: "{{ aodh_service_password }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
register: add_service
when: not aodh_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: "{{ aodh_service_user_name }}"
password: "{{ aodh_service_password }}"
domain: default
default_project: "{{ aodh_service_project_name }}"
endpoint_type: admin
verify: "{{ not keystone_service_adminuri_insecure }}"
register: add_service
when: not aodh_service_in_ldap | bool
until: add_service is success
retries: 5
delay: 10
no_log: True
- name: Ensure aodh 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: "{{ aodh_service_user_name }}"
tenant_name: "{{ aodh_service_project_name }}"
role_name: "{{ aodh_role_name }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
register: add_admin_role
when: not aodh_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: "{{ aodh_service_user_name }}"
role: "{{ aodh_role_name }}"
project: "{{ aodh_service_project_name }}"
endpoint_type: admin
verify: "{{ not keystone_service_adminuri_insecure }}"
register: add_service
when:
- not aodh_service_in_ldap | bool
until: add_service is success
retries: 5
delay: 10
# Create an endpoint
- name: Ensure aodh 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: "{{ aodh_service_region }}"
service_name: "{{ aodh_service_name }}"
service_type: "{{ aodh_service_type }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
endpoint_list:
- url: "{{ aodh_service_publicurl }}"
interface: "public"
- url: "{{ aodh_service_adminurl }}"
interface: "admin"
- url: "{{ aodh_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: "{{ aodh_service_name }}"
endpoint_interface: "{{ item.interface }}"
url: "{{ item.url }}"
region: "{{ aodh_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: "{{ aodh_service_publicurl }}"
- interface: "internal"
url: "{{ aodh_service_internalurl }}"
- interface: "admin"
url: "{{ aodh_service_adminurl }}"