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. The masakari client is not used on the host, so
it serves no purpose. As there are no required packages left, the task to
install them is also removed.

Change-Id: I5f4339b322b967fcfd326c7442d634abf8b6cb05

defaults/main.yml

@@ -16,7 +16,10 @@
 ## Verbosity Options
 debug: False
 
-masakari_role_project_group: masakari_all
+# Set the host which will execute the shade modules
+# for the service setup. The host must already have
+# clouds.yaml properly configured.
+masakari_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}"
 
 # Set the package install state for distribution and pip packages
 # Options are 'present' and 'latest'
@@ -44,13 +47,6 @@ masakari_galera_user: masakari
 masakari_galera_use_ssl: "{{ galera_use_ssl | default(False) }}"
 masakari_galera_ssl_ca_cert: "{{ galera_ssl_ca_cert | default('/etc/ssl/certs/galera-ca.pem') }}"
 
-# masakari packages that must be installed before anything else
-masakari_requires_pip_packages:
-  - virtualenv
-  - python-masakariclient
-  - python-keystoneclient # Keystoneclient needed to OSA keystone lib
-
-
 # venv_download, even when true, will use the fallback method of building the
 # venv from scratch if the venv download fails.
 masakari_venv_download: "{{ not masakari_developer_mode | bool }}"
@@ -122,3 +118,9 @@ masakari_services:
   masakari-engine:
     group: masakari_engine
     service_name: masakari-engine
+
+# This variable is used by the repo_build process to determine
+# which host group to check for members of before building the
+# pip packages required by this role. The value is picked up
+# by the py_pkgs lookup.
+masakari_role_project_group: masakari_all

meta/main.yml

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

tasks/masakari_install.yml

@@ -33,19 +33,6 @@
       {% endfor %}
   when: masakari_developer_mode | bool
 
-- name: Install requires pip packages
-  pip:
-    name: "{{ masakari_requires_pip_packages }}"
-    state: "{{ masakari_pip_package_state }}"
-    extra_args: >-
-      {{ masakari_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: "{{ masakari_venv_download_url | replace('tgz', 'checksum') }}"

tasks/masakari_service_setup.yml

@@ -13,83 +13,81 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Create a service
-- name: Ensure masakari 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: "{{ masakari_service_name }}"
-    service_type: "{{ masakari_service_type }}"
-    description: "{{ masakari_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: "{{ masakari_service_setup_host }}"
+  vars:
+    ansible_python_interpreter: >-
+      {{ (masakari_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: "{{ masakari_service_name }}"
+        service_type: "{{ masakari_service_type }}"
+        description: "{{ masakari_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 masakari 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: "{{ masakari_service_user_name }}"
-    tenant_name: "{{ masakari_service_project_name }}"
-    password: "{{ masakari_service_password }}"
-    insecure: "{{ keystone_service_adminuri_insecure }}"
-  register: add_service
-  when: not masakari_service_in_ldap | bool
-  until: add_service|success
-  retries: 5
-  delay: 10
-  no_log: True
+    - name: Add service user
+      os_user:
+        cloud: default
+        state: present
+        name: "{{ masakari_service_user_name }}"
+        password: "{{ masakari_service_password }}"
+        domain: default
+        default_project: "{{ masakari_service_project_name }}"
+        endpoint_type: admin
+        verify: "{{ not keystone_service_adminuri_insecure }}"
+      register: add_service
+      when: not masakari_service_in_ldap | bool
+      until: add_service is success
+      retries: 5
+      delay: 10
+      no_log: True
 
-# Add a role to the user
-- name: Ensure masakari 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: "{{ masakari_service_user_name }}"
-    tenant_name: "{{ masakari_service_project_name }}"
-    role_name: "{{ masakari_role_name }}"
-    insecure: "{{ keystone_service_adminuri_insecure }}"
-  register: add_service
-  when: not masakari_service_in_ldap | bool
-  until: add_service|success
-  retries: 5
-  delay: 10
-  no_log: True
+    - name: Add service user to admin role
+      os_user_role:
+        cloud: default
+        state: present
+        user: "{{ masakari_service_user_name }}"
+        role: "{{ masakari_role_name }}"
+        project: "{{ masakari_service_project_name }}"
+        endpoint_type: admin
+        verify: "{{ not keystone_service_adminuri_insecure }}"
+      register: add_service
+      when: not masakari_service_in_ldap | bool
+      until: add_service is success
+      retries: 5
+      delay: 10
 
-# Create an endpoint
-- name: Ensure masakari 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: "{{ masakari_service_region }}"
-    service_name: "{{ masakari_service_name }}"
-    service_type: "{{ masakari_service_type }}"
-    insecure: "{{ keystone_service_adminuri_insecure }}"
-    endpoint_list:
-      - url: "{{ masakari_service_publicurl }}"
-        interface: "public"
-      - url: "{{ masakari_service_internalurl }}"
-        interface: "internal"
-      - url: "{{ masakari_service_adminurl }}"
-        interface: "admin"
-  register: add_service
-  until: add_service|success
-  retries: 5
-  delay: 10
-  no_log: True
+    - name: Add endpoints to keystone endpoint catalog
+      os_keystone_endpoint:
+        cloud: default
+        state: present
+        service: "{{ masakari_service_name }}"
+        endpoint_interface: "{{ item.interface }}"
+        url: "{{ item.url }}"
+        region: "{{ masakari_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: "{{ masakari_service_publicurl }}"
+        - interface: "internal"
+          url: "{{ masakari_service_internalurl }}"
+        - interface: "admin"
+          url: "{{ masakari_service_adminurl }}"

tests/host_vars/localhost.yml

@@ -16,5 +16,3 @@
 bridges:
   - name: "br-mgmt"
     ip_addr: "10.1.0.1"
-
-ansible_python_interpreter: "/usr/bin/python2"

tests/test-install-masakari.yml

@@ -16,7 +16,6 @@
 - name: Playbook for deploying masakari
   hosts: masakari_all
   user: root
-  become: true
   gather_facts: true
   any_errors_fatal: true
   pre_tasks:

tests/test-masakari-functional.yml

@@ -20,11 +20,9 @@
   tasks:
     - name: check masakari api
       uri:
-        url: "http://localhost:{{ item.value.service_name['masakari-api'] }}"
+        url: "http://localhost:15868"
         status_code: 200
       register: result
       until: result.status == 200
       retries: 5
       delay: 10
-      with_items:
-        - 15868