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.

With the dependent patches, the openstack_openrc role is now executed once
on the designated host, so it is no longer required as a meta-dependency for
the role.

Depends-On: https://review.openstack.org/582359
Change-Id: Ic844753c3ece4383eefa490f00be0bff441c6a7e

defaults/main.yml

@@ -16,6 +16,11 @@
 ## Verbosity Option
 debug: False
 
+# Set the host which will execute the shade modules
+# for the service setup. The host must already have
+# clouds.yaml properly configured.
+zaqar_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}"
+
 # Set the package install state for distribution packages
 # Options are 'present' and 'latest'
 zaqar_package_state: "latest"
@@ -112,11 +117,6 @@ zaqar_secret_key: notreallysecret
 zaqar_enable_notification: false
 zaqar_unreliable: true
 
-# zaqar packages that must be installed before anything else
-zaqar_requires_pip_packages:
-  - virtualenv
-  - python-keystoneclient # Keystoneclient needed to OSA keystone lib
-
 # Common pip packages
 zaqar_pip_packages:
   - osprofiler

tasks/zaqar_install.yml

@@ -33,22 +33,6 @@
     - zaqar-install
     - zaqar-pip-packages
 
-- name: Install requires pip packages
-  pip:
-    name: "{{ zaqar_requires_pip_packages }}"
-    state: "{{ zaqar_pip_package_state }}"
-    extra_args: >-
-      {{ zaqar_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
-  tags:
-    - zaqar-install
-    - zaqar-pip-packages
-
 - name: Retrieve checksum for venv download
   uri:
     url: "{{ zaqar_venv_download_url | replace('tgz', 'checksum') }}"

tasks/zaqar_service_setup.yml

@@ -13,106 +13,93 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Ensure zaqar 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: "{{ zaqar_service_name }}"
-    service_type: "{{ zaqar_service_type }}"
-    description: "{{ zaqar_service_description }}"
-    insecure: "{{ keystone_service_adminuri_insecure }}"
-  register: add_service
-  until: add_service|success
-  retries: 5
-  delay: 2
-  no_log: True
-  tags:
-    - zaqar-setup
-    - zaqar-service-add
+# 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: "{{ zaqar_service_setup_host }}"
+  vars:
+    ansible_python_interpreter: >-
+      {{ (zaqar_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: "{{ zaqar_service_name }}"
+        service_type: "{{ zaqar_service_type }}"
+        description: "{{ zaqar_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 service project
-  keystone:
-    command: ensure_project
-    project_name: "{{ zaqar_service_tenant_name }}"
-    region_name: "{{ zaqar_service_region }}"
-    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 }}"
-  no_log: True
-  tags:
-    - zaqar-setup
-    - zaqar-service-add
+    - name: Add service project
+      os_project:
+        cloud: default
+        state: present
+        name: "{{ zaqar_service_project_name }}"
+        description: "{{ zaqar_service_description }}"
+        domain: "Default"
+        endpoint_type: admin
+        verify: "{{ not keystone_service_adminuri_insecure }}"
+      register: add_service
+      until: add_service is success
+      retries: 5
+      delay: 10
 
-- name: Ensure zaqar 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: "{{ zaqar_service_user_name }}"
-    tenant_name: "{{ zaqar_service_tenant_name }}"
-    password: "{{ zaqar_service_user_password }}"
-    insecure: "{{ keystone_service_adminuri_insecure }}"
-  register: add_service
-  until: add_service|success
-  retries: 5
-  delay: 10
-  no_log: True
-  tags:
-    - zaqar-setup
-    - zaqar-service-add
+    - name: Add service user
+      os_user:
+        cloud: default
+        state: present
+        name: "{{ zaqar_service_user_name }}"
+        password: "{{ zaqar_service_user_password }}"
+        domain: default
+        default_project: "{{ zaqar_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: Ensure zaqar 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: "{{ zaqar_service_user_name }}"
-    tenant_name: "{{ zaqar_service_project_name }}"
-    role_name: "{{ zaqar_service_role_name }}"
-    insecure: "{{ keystone_service_adminuri_insecure }}"
-  register: add_admin_role
-  until: add_admin_role|success
-  retries: 5
-  delay: 10
-  no_log: True
-  tags:
-    - zaqar-service-add
-    - zaqar-setup
+    - name: Add service user to admin role
+      os_user_role:
+        cloud: default
+        state: present
+        user: "{{ zaqar_service_user_name }}"
+        role: "{{ zaqar_service_role_name }}"
+        project: "{{ zaqar_service_project_name }}"
+        endpoint_type: admin
+        verify: "{{ not keystone_service_adminuri_insecure }}"
+      register: add_service
+      until: add_service is success
+      retries: 5
+      delay: 10
 
-
-# Create an endpoint
-- name: Ensure zaqar 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: "{{ zaqar_service_region }}"
-    service_name: "{{ zaqar_service_name }}"
-    service_type: "{{ zaqar_service_type }}"
-    insecure: "{{ keystone_service_adminuri_insecure }}"
-    endpoint_list:
-      - url: "{{ zaqar_service_publicurl }}"
-        interface: "public"
-      - url: "{{ zaqar_service_adminurl }}"
-        interface: "admin"
-      - url: "{{ zaqar_service_internalurl }}"
-        interface: "internal"
-  register: add_service
-  until: add_service|success
-  retries: 5
-  delay: 10
-  no_log: True
-  tags:
-    - zaqar-setup
-    - zaqar-service-add
+    - name: Add endpoints to keystone endpoint catalog
+      os_keystone_endpoint:
+        cloud: default
+        state: present
+        service: "{{ zaqar_service_name }}"
+        endpoint_interface: "{{ item.interface }}"
+        url: "{{ item.url }}"
+        region: "{{ zaqar_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: "{{ zaqar_service_publicurl }}"
+        - interface: "internal"
+          url: "{{ zaqar_service_internalurl }}"
+        - interface: "admin"
+          url: "{{ zaqar_service_adminurl }}"

tests/host_vars/localhost.yml

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