Use unbound_clients role from plugins collection

Remove the common-tasks version of this function and instead call
a role from the openstack-ansible-plugins collection.

Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-plugins/+/923407
Change-Id: I4fb265e966c972ec06760e228575496ba8e5597c

playbooks/common-tasks/unbound-clients.yml

@@ -1,65 +0,0 @@
----
-# Copyright 2017, Logan Vig <logan2211@gmail.com>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# create a sorted resolver list with affinity toward unbound container(s)
-# on the same physical_host
-- name: Apply resolver sorting
-  set_fact:
-    resolver_list: |-
-      {% set _var = [] %}
-      {% for host in groups[resolvconf_resolver_group] %}
-      {%   if physical_host is defined and
-              hostvars[host]['physical_host'] is defined
-              and physical_host == hostvars[host]['physical_host'] %}
-      {%     set _prio = 100 %}
-      {%   else %}
-      {%     set _prio = 50 %}
-      {%   endif %}
-      {%   set _ = _var.append({
-             'host': hostvars[host]['management_address'],
-             'priority': _prio
-           })
-      %}
-      {% endfor %}
-      {{ _var |
-         sort(reverse=true, attribute='priority') |
-         map(attribute='host') |
-         list
-      }}
-  when:
-    - physical_host is defined
-    - physical_host in hostvars['localhost']['unbound_physical_hosts']
-
-- name: Set resolver IP list fact
-  set_fact:
-    resolvconf_resolver_ips: "{{ resolver_list }}"
-    resolvconf_options:
-      - 'timeout:1'
-  when:
-    - resolver_list is defined
-    - resolver_list | length > 0
-
-# rotate is only used when no physical_host affinity is defined
-- name: Set resolver rotate when physical_host is not an unbound host
-  set_fact:
-    resolvconf_options:
-      - 'timeout:1'
-      - 'rotate'
-  when:
-    - resolver_list is not defined
-
-- name: Include the resolvconf role
-  include_role:
-    name: resolvconf

playbooks/galera-install.yml

@@ -47,7 +47,8 @@
         extra_container_config_no_restart:
           - "lxc.start.order=10"
     - name: Including unbound-clients tasks
-      include_tasks: common-tasks/unbound-clients.yml
+      include_role:
+        name: openstack.osa.unbound_clients
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
     - name: Disabling haproxy backends

playbooks/haproxy-install.yml

@@ -34,7 +34,8 @@
         name: "openstack.osa.{{ container_tech | default('lxc') }}_container_setup"
       when: not is_metal
     - name: Including unbound-clients tasks
-      include_tasks: common-tasks/unbound-clients.yml
+      include_role:
+        name: openstack.osa.unbound_clients
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
     - name: Remove legacy haproxy configuration files

playbooks/memcached-install.yml

@@ -30,7 +30,8 @@
         name: "openstack.osa.{{ container_tech | default('lxc') }}_container_setup"
       when: not is_metal
     - name: Including unbound-clients tasks
-      include_tasks: common-tasks/unbound-clients.yml
+      include_role:
+        name: openstack.osa.unbound_clients
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
   roles:

playbooks/os-adjutant-install.yml

@@ -60,7 +60,8 @@
         - always
 
     - name: Including unbound-clients tasks
-      include_tasks: common-tasks/unbound-clients.yml
+      include_role:
+        name: openstack.osa.unbound_clients
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
 

playbooks/os-aodh-install.yml

@@ -66,7 +66,8 @@
       when: not is_metal
 
     - name: Including unbound-clients tasks
-      include_tasks: common-tasks/unbound-clients.yml
+      include_role:
+        name: openstack.osa.unbound_clients
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
 

playbooks/os-barbican-install.yml

@@ -65,7 +65,8 @@
       when: not is_metal
 
     - name: Including unbound-clients tasks
-      include_tasks: common-tasks/unbound-clients.yml
+      include_role:
+        name: openstack.osa.unbound_clients
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
   roles:

playbooks/os-blazar-install.yml

@@ -65,7 +65,8 @@
       when: not is_metal
 
     - name: Including unbound-clients tasks
-      include_tasks: common-tasks/unbound-clients.yml
+      include_role:
+        name: openstack.osa.unbound_clients
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
 

playbooks/os-ceilometer-install.yml

@@ -41,7 +41,8 @@
       when: not is_metal
 
     - name: Including unbound-clients tasks
-      include_tasks: common-tasks/unbound-clients.yml
+      include_role:
+        name: openstack.osa.unbound_clients
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
   roles:

playbooks/os-cloudkitty-install.yml

@@ -61,7 +61,8 @@
         - always
 
     - name: Including unbound-clients tasks
-      include_tasks: common-tasks/unbound-clients.yml
+      include_role:
+        name: openstack.osa.unbound_clients
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
 

playbooks/os-designate-install.yml

@@ -68,7 +68,8 @@
       when: not is_metal
 
     - name: Including unbound-clients tasks
-      include_tasks: common-tasks/unbound-clients.yml
+      include_role:
+        name: openstack.osa.unbound_clients
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
   roles:

playbooks/os-glance-install.yml

@@ -77,7 +77,8 @@
         - (glance_default_store != "file") or (glance_remote_client is defined)
 
     - name: Including unbound-clients tasks
-      include_tasks: common-tasks/unbound-clients.yml
+      include_role:
+        name: openstack.osa.unbound_clients
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
 

playbooks/os-gnocchi-install.yml

@@ -69,7 +69,8 @@
         - (gnocchi_storage_driver | default('file')) != "file"
 
     - name: Including unbound-clients tasks
-      include_tasks: common-tasks/unbound-clients.yml
+      include_role:
+        name: openstack.osa.unbound_clients
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
   roles:

playbooks/os-heat-install.yml

@@ -65,7 +65,8 @@
       when: not is_metal
 
     - name: Including unbound-clients tasks
-      include_tasks: common-tasks/unbound-clients.yml
+      include_role:
+        name: openstack.osa.unbound_clients
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
   roles:

playbooks/os-horizon-install.yml

@@ -64,7 +64,8 @@
         name: "openstack.osa.{{ container_tech | default('lxc') }}_container_setup"
       when: not is_metal
     - name: Including unbound-clients tasks
-      include_tasks: common-tasks/unbound-clients.yml
+      include_role:
+        name: openstack.osa.unbound_clients
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
   roles:

playbooks/os-ironic-install.yml

@@ -65,7 +65,8 @@
       when: not is_metal
 
     - name: Including unbound-clients tasks
-      include_tasks: common-tasks/unbound-clients.yml
+      include_role:
+        name: openstack.osa.unbound_clients
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
   roles:

playbooks/os-keystone-install.yml

@@ -100,7 +100,8 @@
       when: not is_metal
 
     - name: Including unbound-clients tasks
-      include_tasks: common-tasks/unbound-clients.yml
+      include_role:
+        name: openstack.osa.unbound_clients
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
 

playbooks/os-magnum-install.yml

@@ -68,7 +68,8 @@
       when: not is_metal
 
     - name: Including unbound-clients tasks
-      include_tasks: common-tasks/unbound-clients.yml
+      include_role:
+        name: openstack.osa.unbound_clients
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
 

playbooks/os-manila-install.yml

@@ -69,7 +69,8 @@
         - always
 
     - name: Including unbound-clients tasks
-      include_tasks: common-tasks/unbound-clients.yml
+      include_role:
+        name: openstack.osa.unbound_clients
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
 
@@ -105,7 +106,8 @@
         public: true
 
     - name: Including unbound-clients tasks
-      include_tasks: common-tasks/unbound-clients.yml
+      include_role:
+        name: openstack.osa.unbound_clients
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
 

playbooks/os-masakari-install.yml

@@ -95,7 +95,8 @@
       when: not is_metal
 
     - name: Including unbound-clients tasks
-      include_tasks: common-tasks/unbound-clients.yml
+      include_role:
+        name: openstack.osa.unbound_clients
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
 

playbooks/os-mistral-install.yml

@@ -66,7 +66,8 @@
       when: not is_metal
 
     - name: Including unbound-clients tasks
-      include_tasks: common-tasks/unbound-clients.yml
+      include_role:
+        name: openstack.osa.unbound_clients
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
 

playbooks/os-nova-install.yml

@@ -102,7 +102,8 @@
           - "lxc.start.order=39"
 
     - name: Including unbound-clients tasks
-      include_tasks: common-tasks/unbound-clients.yml
+      include_role:
+        name: openstack.osa.unbound_clients
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
 
@@ -174,7 +175,8 @@
           - "lxc.start.order=39"
 
     - name: Including unbound-clients tasks
-      include_tasks: common-tasks/unbound-clients.yml
+      include_role:
+        name: openstack.osa.unbound_clients
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
 

playbooks/os-octavia-install.yml

@@ -66,7 +66,8 @@
       when: not is_metal
 
     - name: Including unbound-clients tasks
-      include_tasks: common-tasks/unbound-clients.yml
+      include_role:
+        name: openstack.osa.unbound_clients
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
   roles:

playbooks/os-placement-install.yml

@@ -66,7 +66,8 @@
       when: not is_metal
 
     - name: Including unbound-clients tasks
-      include_tasks: common-tasks/unbound-clients.yml
+      include_role:
+        name: openstack.osa.unbound_clients
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
   roles:

playbooks/os-rally-install.yml

@@ -36,7 +36,8 @@
       when:
         - (not (rally_install | default(false)) | bool)
     - name: Including unbound-clients tasks
-      include_tasks: common-tasks/unbound-clients.yml
+      include_role:
+        name: openstack.osa.unbound_clients
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
   roles:

playbooks/os-skyline-install.yml

@@ -51,7 +51,8 @@
       when: not is_metal
 
     - name: Including unbound-clients tasks
-      include_tasks: common-tasks/unbound-clients.yml
+      include_role:
+        name: openstack.osa.unbound_clients
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
 

playbooks/os-swift-install.yml

@@ -52,7 +52,8 @@
       when: not is_metal
 
     - name: Including unbound-clients tasks
-      include_tasks: common-tasks/unbound-clients.yml
+      include_role:
+        name: openstack.osa.unbound_clients
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
 

playbooks/os-trove-install.yml

@@ -69,7 +69,8 @@
       when: not is_metal
 
     - name: Including unbound-clients tasks
-      include_tasks: common-tasks/unbound-clients.yml
+      include_role:
+        name: openstack.osa.unbound_clients
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
   roles:

playbooks/os-zun-install.yml

@@ -82,7 +82,8 @@
       when: not is_metal
 
     - name: Including unbound-clients tasks
-      include_tasks: common-tasks/unbound-clients.yml
+      include_role:
+        name: openstack.osa.unbound_clients
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
 

playbooks/qdrouterd-install.yml

@@ -37,7 +37,8 @@
       when: not is_metal
 
     - name: Including unbound-clients tasks
-      include_tasks: common-tasks/unbound-clients.yml
+      include_role:
+        name: openstack.osa.unbound_clients
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
   roles:

playbooks/rabbitmq-install.yml

@@ -34,7 +34,8 @@
       when: not is_metal
 
     - name: Including unbound-clients tasks
-      include_tasks: common-tasks/unbound-clients.yml
+      include_role:
+        name: openstack.osa.unbound_clients
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
   roles:

playbooks/repo-install.yml

@@ -38,7 +38,8 @@
       when: not is_metal
 
     - name: Including unbound-clients tasks
-      include_tasks: common-tasks/unbound-clients.yml
+      include_role:
+        name: openstack.osa.unbound_clients
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
   environment: "{{ deployment_environment_variables | default({}) }}"

playbooks/unbound-install.yml

@@ -44,7 +44,8 @@
   user: root
   tasks:
     - name: Including unbound-clients tasks
-      include_tasks: common-tasks/unbound-clients.yml
+      include_role:
+        name: openstack.osa.unbound_clients
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
   environment: "{{ deployment_environment_variables | default({}) }}"

playbooks/utility-install.yml

@@ -58,7 +58,8 @@
       when: not is_metal
 
     - name: Including unbound-clients tasks
-      include_tasks: common-tasks/unbound-clients.yml
+      include_role:
+        name: openstack.osa.unbound_clients
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool