Merge "Remove the rabbitmq deterministic sort"

playbooks/common-tasks/rabbitmq-servers-sort.yml

@@ -1,33 +0,0 @@
----
-# Copyright 2016, Rackspace US, Inc.
-#
-# 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.
-
-# Usage:
-#  To use this common task the variable "sort_group_name" needs to be set
-#  This common task will set a fact for "rabbitmq_servers" upon completion.
-
-- name: Sort the rabbitmq servers
-  dist_sort:
-    value_to_lookup: "{{ container_name }}"
-    ref_list: "{{ groups[sort_group_name] }}"
-    src_list: "{{ rabbitmq_servers }}"
-  register: servers
-  tags:
-    - always
-
-- name: Set rabbitmq servers
-  set_fact:
-    rabbitmq_servers: "{{ servers.sorted_list }}"
-  tags:
-    - always

playbooks/os-aodh-install.yml

@@ -19,9 +19,6 @@
   max_fail_percentage: 20
   user: root
   pre_tasks:
-    - include: common-tasks/rabbitmq-servers-sort.yml
-      vars:
-        sort_group_name: "aodh_all"
     - include: common-tasks/os-lxc-container-setup.yml
     - include: common-tasks/rabbitmq-vhost-user.yml
       static: no

playbooks/os-ceilometer-install.yml

@@ -19,9 +19,6 @@
   max_fail_percentage: 20
   user: root
   pre_tasks:
-    - include: common-tasks/rabbitmq-servers-sort.yml
-      vars:
-        sort_group_name: "ceilometer_all"
     - include: common-tasks/os-lxc-container-setup.yml
     - include: common-tasks/rabbitmq-vhost-user.yml
       static: no

playbooks/os-cinder-install.yml

@@ -19,9 +19,6 @@
   max_fail_percentage: 20
   user: root
   pre_tasks:
-    - include: common-tasks/rabbitmq-servers-sort.yml
-      vars:
-        sort_group_name: "cinder_all"
     - include: common-tasks/os-lxc-container-setup.yml
       static: no
       vars:

playbooks/os-glance-install.yml

@@ -19,9 +19,6 @@
   max_fail_percentage: 20
   user: root
   pre_tasks:
-    - include: common-tasks/rabbitmq-servers-sort.yml
-      vars:
-        sort_group_name: "glance_all"
     - include: common-tasks/os-lxc-container-setup.yml
       static: no
       vars:

playbooks/os-heat-install.yml

@@ -19,9 +19,6 @@
   max_fail_percentage: 20
   user: root
   pre_tasks:
-    - include: common-tasks/rabbitmq-servers-sort.yml
-      vars:
-        sort_group_name: "heat_all"
     - include: common-tasks/os-lxc-container-setup.yml
     - include: common-tasks/rabbitmq-vhost-user.yml
       static: no

playbooks/os-horizon-install.yml

@@ -19,9 +19,6 @@
   max_fail_percentage: 20
   user: root
   pre_tasks:
-    - include: common-tasks/rabbitmq-servers-sort.yml
-      vars:
-        sort_group_name: "horizon_all"
     - include: common-tasks/os-lxc-container-setup.yml
     - include: common-tasks/os-log-dir-setup.yml
       vars:

playbooks/os-ironic-install.yml

@@ -18,9 +18,6 @@
   gather_facts: "{{ gather_facts | default(True) }}"
   user: root
   pre_tasks:
-    - include: common-tasks/rabbitmq-servers-sort.yml
-      vars:
-        sort_group_name: "ironic_all"
     - include: common-tasks/os-lxc-container-setup.yml
     - include: common-tasks/rabbitmq-vhost-user.yml
       static: no

playbooks/os-keystone-install.yml

@@ -19,9 +19,6 @@
   max_fail_percentage: 20
   user: root
   pre_tasks:
-    - include: common-tasks/rabbitmq-servers-sort.yml
-      vars:
-        sort_group_name: "keystone_all"
     - include: common-tasks/os-lxc-container-setup.yml
     - include: common-tasks/rabbitmq-vhost-user.yml
       static: no

playbooks/os-magnum-install.yml

@@ -27,9 +27,6 @@
         log_dirs:
           - src: "/openstack/log/{{ inventory_hostname }}-magnum"
             dest: "/var/log/magnum"
-    - include: common-tasks/rabbitmq-servers-sort.yml
-      vars:
-        sort_group_name: "magnum_all"
     - include: common-tasks/rabbitmq-vhost-user.yml
       static: no
       vars:

playbooks/os-neutron-install.yml

@@ -19,9 +19,6 @@
   max_fail_percentage: 20
   user: root
   pre_tasks:
-    - include: common-tasks/rabbitmq-servers-sort.yml
-      vars:
-        sort_group_name: "neutron_all"
     - include: common-tasks/os-lxc-container-setup.yml
       # This config is specific to Ubuntu
       vars:

playbooks/os-nova-install.yml

@@ -19,9 +19,6 @@
   max_fail_percentage: 20
   user: root
   pre_tasks:
-    - include: common-tasks/rabbitmq-servers-sort.yml
-      vars:
-        sort_group_name: "nova_all"
     - include: common-tasks/os-lxc-container-setup.yml
     - include: common-tasks/rabbitmq-vhost-user.yml
       static: no

playbooks/os-sahara-install.yml

@@ -16,9 +16,6 @@
   gather_facts: "{{ gather_facts | default(True) }}"
   user: root
   pre_tasks:
-    - include: common-tasks/rabbitmq-servers-sort.yml
-      vars:
-        sort_group_name: "sahara_all"
     - include: common-tasks/os-lxc-container-setup.yml
     - include: common-tasks/rabbitmq-vhost-user.yml
       static: no

playbooks/os-trove-install.yml

@@ -21,9 +21,6 @@
   gather_facts: "{{ gather_facts | default(True) }}"
   user: root
   pre_tasks:
-    - include: common-tasks/rabbitmq-servers-sort.yml
-      vars:
-        sort_group_name: "trove_all"
     - include: common-tasks/os-lxc-container-setup.yml
     - include: common-tasks/rabbitmq-vhost-user.yml
       static: no