From 144cfe9e7b3a5cfe58f67dfe0f81f61b2df0bd54 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Fri, 14 Oct 2016 09:50:29 -0500 Subject: [PATCH] Remove the rabbitmq deterministic sort This removes the rabbitmq deterministic sort common task. Due to upstream improvements in oslo this common task is no longer needed. Change-Id: I97c85f0c12b877927779dafa983ec1ce2afb5821 Closes-Bug: #1632831 Signed-off-by: Kevin Carter --- .../common-tasks/rabbitmq-servers-sort.yml | 33 ------------------- playbooks/os-aodh-install.yml | 3 -- playbooks/os-ceilometer-install.yml | 3 -- playbooks/os-cinder-install.yml | 3 -- playbooks/os-glance-install.yml | 3 -- playbooks/os-heat-install.yml | 3 -- playbooks/os-horizon-install.yml | 3 -- playbooks/os-ironic-install.yml | 3 -- playbooks/os-keystone-install.yml | 3 -- playbooks/os-magnum-install.yml | 3 -- playbooks/os-neutron-install.yml | 3 -- playbooks/os-nova-install.yml | 3 -- playbooks/os-sahara-install.yml | 3 -- playbooks/os-trove-install.yml | 3 -- 14 files changed, 72 deletions(-) delete mode 100644 playbooks/common-tasks/rabbitmq-servers-sort.yml diff --git a/playbooks/common-tasks/rabbitmq-servers-sort.yml b/playbooks/common-tasks/rabbitmq-servers-sort.yml deleted file mode 100644 index fdb9e09c79..0000000000 --- a/playbooks/common-tasks/rabbitmq-servers-sort.yml +++ /dev/null @@ -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 diff --git a/playbooks/os-aodh-install.yml b/playbooks/os-aodh-install.yml index 309bcd3f8d..57800427de 100644 --- a/playbooks/os-aodh-install.yml +++ b/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 diff --git a/playbooks/os-ceilometer-install.yml b/playbooks/os-ceilometer-install.yml index 1d03cc42cd..4c40cf00a2 100644 --- a/playbooks/os-ceilometer-install.yml +++ b/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 diff --git a/playbooks/os-cinder-install.yml b/playbooks/os-cinder-install.yml index 630ee1477c..846329bef0 100644 --- a/playbooks/os-cinder-install.yml +++ b/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: diff --git a/playbooks/os-glance-install.yml b/playbooks/os-glance-install.yml index 9187796013..c35e95e0c1 100644 --- a/playbooks/os-glance-install.yml +++ b/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: diff --git a/playbooks/os-heat-install.yml b/playbooks/os-heat-install.yml index ea29fac774..1cb4095681 100644 --- a/playbooks/os-heat-install.yml +++ b/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 diff --git a/playbooks/os-horizon-install.yml b/playbooks/os-horizon-install.yml index 7a66b214c9..5cb4a08d2b 100644 --- a/playbooks/os-horizon-install.yml +++ b/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: diff --git a/playbooks/os-ironic-install.yml b/playbooks/os-ironic-install.yml index 805a6e71eb..d6230ceab4 100644 --- a/playbooks/os-ironic-install.yml +++ b/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 diff --git a/playbooks/os-keystone-install.yml b/playbooks/os-keystone-install.yml index b6e414d3cc..ff1efdf53e 100644 --- a/playbooks/os-keystone-install.yml +++ b/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 diff --git a/playbooks/os-magnum-install.yml b/playbooks/os-magnum-install.yml index 84464ae2fb..3b6fe2296e 100644 --- a/playbooks/os-magnum-install.yml +++ b/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: diff --git a/playbooks/os-neutron-install.yml b/playbooks/os-neutron-install.yml index 1f01782af9..4dfc3dab58 100644 --- a/playbooks/os-neutron-install.yml +++ b/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: diff --git a/playbooks/os-nova-install.yml b/playbooks/os-nova-install.yml index f9e6fb97b5..2d00279c02 100644 --- a/playbooks/os-nova-install.yml +++ b/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 diff --git a/playbooks/os-sahara-install.yml b/playbooks/os-sahara-install.yml index db1aa0f7b8..71683211a9 100644 --- a/playbooks/os-sahara-install.yml +++ b/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 diff --git a/playbooks/os-trove-install.yml b/playbooks/os-trove-install.yml index c5f2483dfa..09e2aee328 100644 --- a/playbooks/os-trove-install.yml +++ b/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