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: I673a465863559d6fc72e4fdcd5da2ab788e561ab

defaults/main.yml

@@ -19,6 +19,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.
+monasca_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}"
+
 # Set the package install state for distribution and pip packages
 # Options are 'present' and 'latest'
 monasca_package_state: "latest"
@@ -256,13 +261,6 @@ monasca_persister_workers: "{{ [[ansible_processor_vcpus|default(2) // 2, 1] | m
 
 monasca_service_in_ldap: False
 
-## Monasca packages that must be installed before anything else
-monasca_requires_pip_packages:
-  - httplib2
-  - python-keystoneclient
-  - python-monascaclient
-  - virtualenv
-
 monasca_pip_packages:
   - cassandra-driver
   - cryptography

meta/main.yml

@@ -37,7 +37,6 @@ galaxy_info:
 
 dependencies:
   - galera_client
-  - openstack_openrc
   - role: apt_package_pinning
     when:
       - ansible_pkg_mgr == 'apt'

releasenotes/notes/monasca-service-setup-host-5d1cd9cd6fa7608d.yaml

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

tasks/monasca_install.yml

@@ -37,19 +37,6 @@
   when:
     - monasca_developer_mode | bool
 
-- name: Install requires pip packages
-  pip:
-    name: "{{ monasca_requires_pip_packages }}"
-    state: "{{ monasca_pip_package_state }}"
-    extra_args: >-
-      {{ monasca_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|success
-  retries: 5
-  delay: 2
-
 - name: Retrieve checksum for venv download
   uri:
     url: "{{ monasca_venv_download_url | replace('tgz', 'checksum') }}"

tasks/monasca_service_setup.yml

@@ -16,163 +16,139 @@
 # (c) 2016 Donovan Francesco <donovan.francesco@is.co.za>
 # (c) 2016 Paul Stevens <paul.stevens@is.co.za>
 
-# Create a service
-- name: Ensure monasca 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: "{{ monasca_service_name }}"
-    service_type: "{{ monasca_service_type }}"
-    description: "{{ monasca_service_description }}"
-    insecure: "{{ keystone_service_adminuri_insecure }}"
-  register: add_service
-  until: add_service|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: "{{ monasca_service_setup_host }}"
+  vars:
+    ansible_python_interpreter: >-
+      {{ (monasca_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: "{{ monasca_service_name }}"
+        service_type: "{{ monasca_service_type }}"
+        description: "{{ monasca_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 monasca 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: "{{ monasca_service_user_name }}"
-    tenant_name: "{{ monasca_service_project_name }}"
-    password: "{{ monasca_service_password }}"
-    insecure: "{{ keystone_service_adminuri_insecure }}"
-  register: add_user
-  when: not monasca_service_in_ldap | bool
-  until: add_user|success
-  retries: 5
-  delay: 10
-  no_log: True
+    - name: Add service users
+      os_user:
+        cloud: default
+        state: present
+        name: "{{ item.name }}"
+        password: "{{ item.password }}"
+        domain: default
+        default_project: "{{ item.default_project }}"
+        endpoint_type: admin
+        verify: "{{ not keystone_service_adminuri_insecure }}"
+      register: add_service
+      when: not monasca_service_in_ldap | bool
+      until: add_service is success
+      retries: 5
+      delay: 10
+      no_log: True
+      with_items:
+        - name: "{{ monasca_service_user_name }}"
+          password: "{{ monasca_service_password }}"
+          default_project: "{{ monasca_service_project_name }}"
+        - name: "{{ monasca_agent_user_name }}"
+          password: "{{ monasca_agent_password }}"
+          default_project: "{{ monasca_agent_project_name }}"
+      loop_control:
+        label: "{{ item.name }}"
 
-# Add a role to the user
-- name: Ensure monasca 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: "{{ monasca_service_user_name }}"
-    tenant_name: "{{ monasca_service_project_name }}"
-    role_name: "{{ monasca_role_name }}"
-    insecure: "{{ keystone_service_adminuri_insecure }}"
-  register: add_user_role
-  when: not monasca_service_in_ldap | bool
-  until: add_user_role|success
-  retries: 5
-  delay: 10
-  no_log: True
+    - name: Add monasca user, agent and read only roles
+      os_keystone_role:
+        cloud: default
+        state: present
+        name: "{{ item }}"
+        endpoint_type: admin
+        verify: "{{ not keystone_service_adminuri_insecure }}"
+      register: add_service
+      when: not monasca_service_in_ldap | bool
+      until: add_service is success
+      retries: 5
+      delay: 10
+      with_flattened:
+        - "{{ monasca_user_roles }}"
+        - "{{ monasca_agent_roles }}"
+        - "{{ monasca_read_only_user_roles }}"
 
-# Create monasca roles
-- name: Ensure monasca user, agent and read only roles
-  keystone:
-    command: "ensure_role"
-    endpoint: "{{ keystone_service_adminurl }}"
-    login_user: "{{ keystone_admin_user_name }}"
-    login_password: "{{ keystone_auth_admin_password }}"
-    login_project_name: "{{ keystone_admin_tenant_name }}"
-    role_name: "{{ item }}"
-    insecure: "{{ keystone_service_adminuri_insecure }}"
-  register: add_roles
-  when: not monasca_service_in_ldap | bool
-  until: add_roles|success
-  retries: 5
-  delay: 10
-  no_log: True
-  with_flattened:
-    - "{{ monasca_user_roles }}"
-    - "{{ monasca_agent_roles }}"
-    - "{{ monasca_read_only_user_roles }}"
+    - name: Add service user to admin role
+      os_user_role:
+        cloud: default
+        state: present
+        user: "{{ monasca_service_user_name }}"
+        role: "{{ monasca_role_name }}"
+        project: "{{ monasca_service_project_name }}"
+        endpoint_type: admin
+        verify: "{{ not keystone_service_adminuri_insecure }}"
+      register: add_service
+      when: not monasca_service_in_ldap | bool
+      until: add_service is success
+      retries: 5
+      delay: 10
 
-# Create an monasca-agent user
-- name: Ensure monasca-agent 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: "{{ monasca_agent_user_name }}"
-    tenant_name: "{{ monasca_agent_project_name }}"
-    password: "{{ monasca_agent_password }}"
-    insecure: "{{ keystone_service_adminuri_insecure }}"
-  register: add_user
-  when: not monasca_service_in_ldap | bool
-  until: add_user|success
-  retries: 5
-  delay: 10
-  no_log: True
+    - name: Add agent user to agent roles
+      os_user_role:
+        cloud: default
+        state: present
+        user: "{{ monasca_agent_user_name }}"
+        role: "{{ item }}"
+        project: "{{ monasca_agent_project_name }}"
+        endpoint_type: admin
+        verify: "{{ not keystone_service_adminuri_insecure }}"
+      register: add_service
+      when: not monasca_service_in_ldap | bool
+      until: add_service is success
+      retries: 5
+      delay: 10
+      with_items: "{{ monasca_agent_roles }}"
 
-# Add a role to the user
-- name: Ensure monasca-agent user to monasca-agent roles
-  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: "{{ monasca_agent_user_name }}"
-    tenant_name: "{{ monasca_agent_project_name }}"
-    role_name: "{{ item }}"
-    insecure: "{{ keystone_service_adminuri_insecure }}"
-  register: add_user_role
-  when: not monasca_service_in_ldap | bool
-  until: add_user_role|success
-  retries: 5
-  delay: 10
-  no_log: True
-  with_items: "{{ monasca_agent_roles }}"
+    - name: Add admin user to user roles
+      os_user_role:
+        cloud: default
+        state: present
+        user: "{{ keystone_admin_user_name }}"
+        role: "{{ item }}"
+        project: "{{ keystone_admin_tenant_name }}"
+        endpoint_type: admin
+        verify: "{{ not keystone_service_adminuri_insecure }}"
+      register: add_service
+      when: not monasca_service_in_ldap | bool
+      until: add_service is success
+      retries: 5
+      delay: 10
+      with_items: "{{ monasca_user_roles }}"
 
-# Add a role to the user
-- name: Ensure admin user to monasca-user roles
-  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: "{{ keystone_admin_user_name }}"
-    tenant_name: "{{ keystone_admin_tenant_name }}"
-    role_name: "{{ item }}"
-    insecure: "{{ keystone_service_adminuri_insecure }}"
-  register: add_user_role
-  when: not monasca_service_in_ldap | bool
-  until: add_user_role|success
-  retries: 5
-  delay: 10
-  no_log: True
-  with_items: "{{ monasca_user_roles }}"
-
-# Create an endpoint
-- name: Ensure monasca 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: "{{ monasca_service_region }}"
-    service_name: "{{ monasca_service_name }}"
-    service_type: "{{ monasca_service_type }}"
-    insecure: "{{ keystone_service_adminuri_insecure }}"
-    endpoint_list:
-      - url: "{{ monasca_service_publicurl }}"
-        interface: "public"
-      - url: "{{ monasca_service_internalurl }}"
-        interface: "internal"
-      - url: "{{ monasca_service_adminurl }}"
-        interface: "admin"
-  register: add_endpoint
-  until: add_endpoint|success
-  retries: 5
-  delay: 10
-  no_log: True
+    - name: Add endpoints to keystone endpoint catalog
+      os_keystone_endpoint:
+        cloud: default
+        state: present
+        service: "{{ monasca_service_name }}"
+        endpoint_interface: "{{ item.interface }}"
+        url: "{{ item.url }}"
+        region: "{{ monasca_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: "{{ monasca_service_publicurl }}"
+        - interface: "internal"
+          url: "{{ monasca_service_internalurl }}"
+        - interface: "admin"
+          url: "{{ monasca_service_adminurl }}"

tests/host_vars/localhost.yml

@@ -14,7 +14,6 @@
 # limitations under the License.
 
 ansible_host: 127.0.0.1
-ansible_python_interpreter: "/usr/bin/python2"
 bridges:
   - name: "br-mgmt"
     ip_addr: "10.1.1.1"

tests/test-install-monasca.yml

@@ -19,7 +19,6 @@
 - name: Install monasca server
   hosts: monasca_all
   remote_user: root
-  become: true
   gather_facts: true
   roles:
     - role: "os_monasca"