From 19933e5f03771c0aaa0c58c7a21cf40efd4ad799 Mon Sep 17 00:00:00 2001 From: Wes Hayutin Date: Wed, 21 Dec 2016 17:49:56 -0500 Subject: [PATCH] Ensure that each role in extras has a dependency on extras-common As more ansible variables are shared or reused across roles it is important to define these variables in a role that is always executed. In this case that role is extras-common. Note: This review is a blocker for https://review.openstack.org/#/c/418998/ Change-Id: I31fd13d7bcb98d73e7f16048c57c027d95faeec5 --- roles/baremetal-prep-overcloud/meta/main.yml | 3 ++ roles/baremetal-prep-virthost/meta/main.yml | 3 ++ roles/baremetal-undercloud/meta/main.yml | 3 ++ roles/build-test-packages/meta/main.yml | 3 ++ roles/collect-logs/meta/main.yml | 3 ++ roles/extras-common/defaults/main.yml | 7 +++++ roles/gate-quickstart/meta/main.yml | 3 ++ roles/ovb-manage-stack/meta/main.yml | 3 ++ roles/overcloud-prep-config/meta/main.yml | 1 + roles/overcloud-prep-flavors/meta/main.yml | 3 +- roles/overcloud-prep-images/meta/main.yml | 3 +- roles/overcloud-prep-network/meta/main.yml | 2 -- roles/overcloud-scale/meta/main.yml | 3 ++ roles/overcloud-ssl/meta/main.yml | 3 +- roles/overcloud-upgrade/meta/main.yml | 32 ++------------------ roles/repo-setup/meta/main.yml | 3 ++ roles/undercloud-deploy/meta/main.yml | 3 +- roles/validate-ha/meta/main.yml | 3 ++ roles/validate-ipmi/meta/main.yml | 3 ++ roles/validate-simple/meta/main.yml | 2 ++ roles/validate-tempest/meta/main.yml | 3 ++ roles/virthost-full-cleanup/meta/main.yml | 3 ++ 22 files changed, 56 insertions(+), 39 deletions(-) create mode 100644 roles/baremetal-prep-overcloud/meta/main.yml create mode 100644 roles/baremetal-prep-virthost/meta/main.yml create mode 100644 roles/baremetal-undercloud/meta/main.yml create mode 100644 roles/build-test-packages/meta/main.yml create mode 100644 roles/collect-logs/meta/main.yml create mode 100644 roles/gate-quickstart/meta/main.yml create mode 100644 roles/ovb-manage-stack/meta/main.yml create mode 100644 roles/overcloud-scale/meta/main.yml create mode 100644 roles/repo-setup/meta/main.yml create mode 100644 roles/validate-ha/meta/main.yml create mode 100644 roles/validate-ipmi/meta/main.yml create mode 100644 roles/validate-simple/meta/main.yml create mode 100644 roles/validate-tempest/meta/main.yml create mode 100644 roles/virthost-full-cleanup/meta/main.yml diff --git a/roles/baremetal-prep-overcloud/meta/main.yml b/roles/baremetal-prep-overcloud/meta/main.yml new file mode 100644 index 000000000..a1f0ecb27 --- /dev/null +++ b/roles/baremetal-prep-overcloud/meta/main.yml @@ -0,0 +1,3 @@ +dependencies: + - extras-common + diff --git a/roles/baremetal-prep-virthost/meta/main.yml b/roles/baremetal-prep-virthost/meta/main.yml new file mode 100644 index 000000000..a1f0ecb27 --- /dev/null +++ b/roles/baremetal-prep-virthost/meta/main.yml @@ -0,0 +1,3 @@ +dependencies: + - extras-common + diff --git a/roles/baremetal-undercloud/meta/main.yml b/roles/baremetal-undercloud/meta/main.yml new file mode 100644 index 000000000..a1f0ecb27 --- /dev/null +++ b/roles/baremetal-undercloud/meta/main.yml @@ -0,0 +1,3 @@ +dependencies: + - extras-common + diff --git a/roles/build-test-packages/meta/main.yml b/roles/build-test-packages/meta/main.yml new file mode 100644 index 000000000..a1f0ecb27 --- /dev/null +++ b/roles/build-test-packages/meta/main.yml @@ -0,0 +1,3 @@ +dependencies: + - extras-common + diff --git a/roles/collect-logs/meta/main.yml b/roles/collect-logs/meta/main.yml new file mode 100644 index 000000000..a1f0ecb27 --- /dev/null +++ b/roles/collect-logs/meta/main.yml @@ -0,0 +1,3 @@ +dependencies: + - extras-common + diff --git a/roles/extras-common/defaults/main.yml b/roles/extras-common/defaults/main.yml index 2654f0d0f..ffbf4fc6b 100644 --- a/roles/extras-common/defaults/main.yml +++ b/roles/extras-common/defaults/main.yml @@ -2,3 +2,10 @@ overcloud_ipv6: false containerized_overcloud: false overcloud_templates_path: /usr/share/openstack-tripleo-heat-templates +# TODO(hrybacki): remove after https://review.openstack.org/#/c/418998/ merges +# The overcloud-deploy role had a dependency on the tripleo role (no longer +# exists) which depdended on the common role which /has/ `enable_pacemaker`. +# this workaround can be removed after https://review.openstack.org/#/c/413800/ +# is merged creating a dependency chain common<-extras-common<-overcloud-deploy +enable_pacemaker: false + diff --git a/roles/gate-quickstart/meta/main.yml b/roles/gate-quickstart/meta/main.yml new file mode 100644 index 000000000..a1f0ecb27 --- /dev/null +++ b/roles/gate-quickstart/meta/main.yml @@ -0,0 +1,3 @@ +dependencies: + - extras-common + diff --git a/roles/ovb-manage-stack/meta/main.yml b/roles/ovb-manage-stack/meta/main.yml new file mode 100644 index 000000000..a1f0ecb27 --- /dev/null +++ b/roles/ovb-manage-stack/meta/main.yml @@ -0,0 +1,3 @@ +dependencies: + - extras-common + diff --git a/roles/overcloud-prep-config/meta/main.yml b/roles/overcloud-prep-config/meta/main.yml index 819da26a3..a1f0ecb27 100644 --- a/roles/overcloud-prep-config/meta/main.yml +++ b/roles/overcloud-prep-config/meta/main.yml @@ -1,2 +1,3 @@ dependencies: - extras-common + diff --git a/roles/overcloud-prep-flavors/meta/main.yml b/roles/overcloud-prep-flavors/meta/main.yml index 97b7a87bd..819da26a3 100644 --- a/roles/overcloud-prep-flavors/meta/main.yml +++ b/roles/overcloud-prep-flavors/meta/main.yml @@ -1,3 +1,2 @@ dependencies: - - libvirt - - tripleo + - extras-common diff --git a/roles/overcloud-prep-images/meta/main.yml b/roles/overcloud-prep-images/meta/main.yml index 97b7a87bd..819da26a3 100644 --- a/roles/overcloud-prep-images/meta/main.yml +++ b/roles/overcloud-prep-images/meta/main.yml @@ -1,3 +1,2 @@ dependencies: - - libvirt - - tripleo + - extras-common diff --git a/roles/overcloud-prep-network/meta/main.yml b/roles/overcloud-prep-network/meta/main.yml index f1eb69920..819da26a3 100644 --- a/roles/overcloud-prep-network/meta/main.yml +++ b/roles/overcloud-prep-network/meta/main.yml @@ -1,4 +1,2 @@ dependencies: - - libvirt - - tripleo - extras-common diff --git a/roles/overcloud-scale/meta/main.yml b/roles/overcloud-scale/meta/main.yml new file mode 100644 index 000000000..a1f0ecb27 --- /dev/null +++ b/roles/overcloud-scale/meta/main.yml @@ -0,0 +1,3 @@ +dependencies: + - extras-common + diff --git a/roles/overcloud-ssl/meta/main.yml b/roles/overcloud-ssl/meta/main.yml index e7e849c51..a1f0ecb27 100644 --- a/roles/overcloud-ssl/meta/main.yml +++ b/roles/overcloud-ssl/meta/main.yml @@ -1,2 +1,3 @@ dependencies: - - extras-common + - extras-common + diff --git a/roles/overcloud-upgrade/meta/main.yml b/roles/overcloud-upgrade/meta/main.yml index 587760bb1..a1f0ecb27 100644 --- a/roles/overcloud-upgrade/meta/main.yml +++ b/roles/overcloud-upgrade/meta/main.yml @@ -1,31 +1,3 @@ ---- -# Copyright Red Hat, Inc. All Rights Reserved. -# -# 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. -# +dependencies: + - extras-common -galaxy_info: - author: redhat-openstack - description: Ansible set of tasks for upgrading Tripleo-Overcloud - company: Red Hat - license: Apache2 - min_ansible_version: 2.0.0 - platforms: - - name: EL - versions: - - all - categories: - - cloud - - python - - development - - openstack diff --git a/roles/repo-setup/meta/main.yml b/roles/repo-setup/meta/main.yml new file mode 100644 index 000000000..a1f0ecb27 --- /dev/null +++ b/roles/repo-setup/meta/main.yml @@ -0,0 +1,3 @@ +dependencies: + - extras-common + diff --git a/roles/undercloud-deploy/meta/main.yml b/roles/undercloud-deploy/meta/main.yml index 97b7a87bd..819da26a3 100644 --- a/roles/undercloud-deploy/meta/main.yml +++ b/roles/undercloud-deploy/meta/main.yml @@ -1,3 +1,2 @@ dependencies: - - libvirt - - tripleo + - extras-common diff --git a/roles/validate-ha/meta/main.yml b/roles/validate-ha/meta/main.yml new file mode 100644 index 000000000..a1f0ecb27 --- /dev/null +++ b/roles/validate-ha/meta/main.yml @@ -0,0 +1,3 @@ +dependencies: + - extras-common + diff --git a/roles/validate-ipmi/meta/main.yml b/roles/validate-ipmi/meta/main.yml new file mode 100644 index 000000000..a1f0ecb27 --- /dev/null +++ b/roles/validate-ipmi/meta/main.yml @@ -0,0 +1,3 @@ +dependencies: + - extras-common + diff --git a/roles/validate-simple/meta/main.yml b/roles/validate-simple/meta/main.yml new file mode 100644 index 000000000..819da26a3 --- /dev/null +++ b/roles/validate-simple/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: + - extras-common diff --git a/roles/validate-tempest/meta/main.yml b/roles/validate-tempest/meta/main.yml new file mode 100644 index 000000000..a1f0ecb27 --- /dev/null +++ b/roles/validate-tempest/meta/main.yml @@ -0,0 +1,3 @@ +dependencies: + - extras-common + diff --git a/roles/virthost-full-cleanup/meta/main.yml b/roles/virthost-full-cleanup/meta/main.yml new file mode 100644 index 000000000..a1f0ecb27 --- /dev/null +++ b/roles/virthost-full-cleanup/meta/main.yml @@ -0,0 +1,3 @@ +dependencies: + - extras-common +