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/579233
Depends-On: https://review.openstack.org/579959
Change-Id: Ie32143ba23b964f9ceda98f00ff9cfa1c7a131d6

defaults/main.yml

@@ -17,6 +17,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.
+congress_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}"
+
 ## Set the package install state for distribution packages
 congress_pip_package_state: "latest"
 congress_package_state: "latest"
@@ -40,11 +45,6 @@ congress_etc_dir: "/etc/congress"
 congress_venv_download: "{{ not congress_developer_mode | bool }}"
 congress_venv_download_url: http://127.0.0.1/venvs/untagged/ubuntu/congress.tgz
 
-## Required PIP packages
-congress_requires_pip_packages:
-  - virtualenv
-  - python-keystoneclient # Keystoneclient needed to OSA keystone lib
-
 ## Common PIP packages
 congress_pip_packages:
  - congress

meta/main.yml

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

tasks/congress_install.yml

@@ -34,19 +34,6 @@
       {% endfor %}
   when: congress_developer_mode | bool
 
-- name: Install required pip packages
-  pip:
-    name: "{{ congress_requires_pip_packages }}"
-    state: "{{ congress_pip_package_state }}"
-    extra_args: >-
-      {{ congress_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: "{{ congress_venv_download_url | replace('tgz', 'checksum') }}"

tasks/congress_service_setup.yml

@@ -14,82 +14,81 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Ensure congress service
+# We set the python interpreter to the ansible runtime venv if
-  keystone:
+# the delegation is to localhost so that we get access to the
-    command: "ensure_service"
+# appropriate python libraries in that venv. If the delegation
-    endpoint: "{{ keystone_service_adminurl }}"
+# is to another host, we assume that it is accessible by the
-    login_user: "{{ keystone_admin_user_name }}"
+# system python instead.
-    login_password: "{{ keystone_auth_admin_password }}"
+- name: Setup the service
-    login_project_name: "{{ keystone_admin_tenant_name }}"
+  delegate_to: "{{ congress_service_setup_host }}"
-    service_name: "{{ congress_service_name }}"
+  vars:
-    service_type: "{{ congress_service_type }}"
+    ansible_python_interpreter: >-
-    description: "{{ congress_service_description }}"
+      {{ (congress_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable']) }}
-    insecure: "{{ keystone_service_adminuri_insecure }}"
+  block:
-  register: add_service
+    - name: Add service to the keystone service catalog
-  until: add_service|success
+      os_keystone_service:
-  retries: 5
+        cloud: default
-  delay: 2
+        state: present
-  no_log: True
+        name: "{{ congress_service_name }}"
+        service_type: "{{ congress_service_type }}"
+        description: "{{ congress_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: Add service user
-- name: Ensure congress user
+      os_user:
-  keystone:
+        cloud: default
-    command: "ensure_user"
+        state: present
-    endpoint: "{{ keystone_service_adminurl }}"
+        name: "{{ congress_service_user_name }}"
-    login_user: "{{ keystone_admin_user_name }}"
+        password: "{{ congress_service_password }}"
-    login_password: "{{ keystone_auth_admin_password }}"
+        domain: default
-    login_project_name: "{{ keystone_admin_tenant_name }}"
+        default_project: "{{ congress_service_project_name }}"
-    user_name: "{{ congress_service_user_name }}"
+        endpoint_type: admin
-    tenant_name: "{{ congress_service_project_name }}"
+        verify: "{{ not keystone_service_adminuri_insecure }}"
-    password: "{{ congress_service_password }}"
+      register: add_service
-    insecure: "{{ keystone_service_adminuri_insecure }}"
+      when: not congress_service_in_ldap | bool
-  register: add_service
+      until: add_service is success
-  when: not congress_service_in_ldap | bool
+      retries: 5
-  until: add_service|success
+      delay: 10
-  retries: 5
+      no_log: True
-  delay: 10
-  no_log: True
 
-# Add role to the user
+    - name: Add service user to admin role
-- name: Ensure congress user to admin role
+      os_user_role:
-  keystone:
+        cloud: default
-    command: "ensure_user_role"
+        state: present
-    endpoint: "{{ keystone_service_adminurl }}"
+        user: "{{ congress_service_user_name }}"
-    login_user: "{{ keystone_admin_user_name }}"
+        role: "{{ congress_role_name }}"
-    login_password: "{{ keystone_auth_admin_password }}"
+        project: "{{ congress_service_project_name }}"
-    login_project_name: "{{ keystone_admin_tenant_name }}"
+        endpoint_type: admin
-    user_name: "{{ congress_service_user_name }}"
+        verify: "{{ not keystone_service_adminuri_insecure }}"
-    tenant_name: "{{ congress_service_project_name }}"
+      register: add_service
-    role_name: "{{ congress_role_name }}"
+      when: not congress_service_in_ldap | bool
-    insecure: "{{ keystone_service_adminuri_insecure }}"
+      until: add_service is success
-  register: add_service
+      retries: 5
-  when: not congress_service_in_ldap | bool
+      delay: 10
-  until: add_service|success
-  retries: 5
-  delay: 10
-  no_log: True
 
-# Create an endpoint
+    - name: Add endpoints to keystone endpoint catalog
-- name: Ensure congress endpoint
+      os_keystone_endpoint:
-  keystone:
+        cloud: default
-    command: "ensure_endpoint"
+        state: present
-    endpoint: "{{ keystone_service_adminurl }}"
+        service: "{{ congress_service_name }}"
-    login_user: "{{ keystone_admin_user_name }}"
+        endpoint_interface: "{{ item.interface }}"
-    login_password: "{{ keystone_auth_admin_password }}"
+        url: "{{ item.url }}"
-    login_project_name: "{{ keystone_admin_tenant_name }}"
+        region: "{{ congress_service_region }}"
-    region_name: "{{ congress_service_region }}"
+        endpoint_type: admin
-    service_name: "{{ congress_service_name }}"
+        verify: "{{ not keystone_service_adminuri_insecure }}"
-    service_type: "{{ congress_service_type }}"
+      register: add_service
-    insecure: "{{ keystone_service_adminuri_insecure }}"
+      until: add_service is success
-    endpoint_list:
+      retries: 5
-      - url: "{{ congress_service_publicurl }}"
+      delay: 10
-        interface: "public"
+      with_items:
-      - url: "{{ congress_service_internalurl }}"
+        - interface: "public"
-        interface: "internal"
+          url: "{{ congress_service_publicurl }}"
-      - url: "{{ congress_service_adminurl }}"
+        - interface: "internal"
-        interface: "admin"
+          url: "{{ congress_service_internalurl }}"
-  register: add_service
+        - interface: "admin"
-  until: add_service|success
+          url: "{{ congress_service_adminurl }}"
-  retries: 5
-  delay: 10
-  no_log: True

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-congress.yml

@@ -15,8 +15,7 @@
 
 - name: Playbook for deploying congress
   hosts: congress_all
-  user: root
+  remote_user: root
-  become: true
   gather_facts: true
   any_errors_fatal: true
   pre_tasks: