From 05f6e7f3885f7cf8226568973bb3f8da38894612 Mon Sep 17 00:00:00 2001 From: Sorin Sbarnea Date: Mon, 8 Mar 2021 10:53:52 +0000 Subject: [PATCH] Empty playbooks are not valid Ansible does not allow empty playbooks files, we get rid of them. Also moves one wrongly places verify.yml task file which would have confused molecule. Change-Id: I5cb2bbedde9d872cc3bb09b525881c3bc64a51da Partial: https://review.opendev.org/c/openstack/tripleo-ansible/+/779180 --- _skeleton_role_/molecule/default/verify.yml | 15 --------------- .../molecule/default/verify.yml | 15 --------------- .../tripleo_ceph_uuid/molecule/default/verify.yml | 15 --------------- .../molecule/default/verify.yml | 15 --------------- .../tripleo_cephadm/molecule/default/converge.yml | 2 +- .../molecule/default/{ => tasks}/verify.yml | 0 .../molecule/addkey/verify.yml | 15 --------------- .../molecule/default/verify.yml | 15 --------------- .../molecule/keygen/verify.yml | 15 --------------- .../molecule/default/verify.yml | 15 --------------- .../molecule/default/verify.yml | 15 --------------- .../tripleo_nvdimm/molecule/default/verify.yml | 15 --------------- .../molecule/default/verify.yml | 15 --------------- .../molecule/default/verify.yml | 15 --------------- 14 files changed, 1 insertion(+), 181 deletions(-) delete mode 100644 _skeleton_role_/molecule/default/verify.yml delete mode 100644 tripleo_ansible/roles/tripleo_ceph_run_ansible/molecule/default/verify.yml delete mode 100644 tripleo_ansible/roles/tripleo_ceph_uuid/molecule/default/verify.yml delete mode 100644 tripleo_ansible/roles/tripleo_ceph_work_dir/molecule/default/verify.yml rename tripleo_ansible/roles/tripleo_cephadm/molecule/default/{ => tasks}/verify.yml (100%) delete mode 100644 tripleo_ansible/roles/tripleo_create_admin/molecule/addkey/verify.yml delete mode 100644 tripleo_ansible/roles/tripleo_create_admin/molecule/default/verify.yml delete mode 100644 tripleo_ansible/roles/tripleo_create_admin/molecule/keygen/verify.yml delete mode 100644 tripleo_ansible/roles/tripleo_derived_parameters/molecule/default/verify.yml delete mode 100644 tripleo_ansible/roles/tripleo_ha_wrapper/molecule/default/verify.yml delete mode 100644 tripleo_ansible/roles/tripleo_nvdimm/molecule/default/verify.yml delete mode 100644 tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/verify.yml delete mode 100644 tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/verify.yml diff --git a/_skeleton_role_/molecule/default/verify.yml b/_skeleton_role_/molecule/default/verify.yml deleted file mode 100644 index ede65b54e..000000000 --- a/_skeleton_role_/molecule/default/verify.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -# Copyright 2020 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. diff --git a/tripleo_ansible/roles/tripleo_ceph_run_ansible/molecule/default/verify.yml b/tripleo_ansible/roles/tripleo_ceph_run_ansible/molecule/default/verify.yml deleted file mode 100644 index dfd4c7352..000000000 --- a/tripleo_ansible/roles/tripleo_ceph_run_ansible/molecule/default/verify.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -# Copyright 2019 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. diff --git a/tripleo_ansible/roles/tripleo_ceph_uuid/molecule/default/verify.yml b/tripleo_ansible/roles/tripleo_ceph_uuid/molecule/default/verify.yml deleted file mode 100644 index dfd4c7352..000000000 --- a/tripleo_ansible/roles/tripleo_ceph_uuid/molecule/default/verify.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -# Copyright 2019 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. diff --git a/tripleo_ansible/roles/tripleo_ceph_work_dir/molecule/default/verify.yml b/tripleo_ansible/roles/tripleo_ceph_work_dir/molecule/default/verify.yml deleted file mode 100644 index dfd4c7352..000000000 --- a/tripleo_ansible/roles/tripleo_ceph_work_dir/molecule/default/verify.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -# Copyright 2019 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. diff --git a/tripleo_ansible/roles/tripleo_cephadm/molecule/default/converge.yml b/tripleo_ansible/roles/tripleo_cephadm/molecule/default/converge.yml index 0126ef082..0c499ddf5 100644 --- a/tripleo_ansible/roles/tripleo_cephadm/molecule/default/converge.yml +++ b/tripleo_ansible/roles/tripleo_cephadm/molecule/default/converge.yml @@ -47,4 +47,4 @@ tripleo_cephadm_client_keys: "{{ mock_ceph_keys }}" - name: Run verify tasks - include_tasks: verify.yml + include_tasks: tasks/verify.yml diff --git a/tripleo_ansible/roles/tripleo_cephadm/molecule/default/verify.yml b/tripleo_ansible/roles/tripleo_cephadm/molecule/default/tasks/verify.yml similarity index 100% rename from tripleo_ansible/roles/tripleo_cephadm/molecule/default/verify.yml rename to tripleo_ansible/roles/tripleo_cephadm/molecule/default/tasks/verify.yml diff --git a/tripleo_ansible/roles/tripleo_create_admin/molecule/addkey/verify.yml b/tripleo_ansible/roles/tripleo_create_admin/molecule/addkey/verify.yml deleted file mode 100644 index dfd4c7352..000000000 --- a/tripleo_ansible/roles/tripleo_create_admin/molecule/addkey/verify.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -# Copyright 2019 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. diff --git a/tripleo_ansible/roles/tripleo_create_admin/molecule/default/verify.yml b/tripleo_ansible/roles/tripleo_create_admin/molecule/default/verify.yml deleted file mode 100644 index dfd4c7352..000000000 --- a/tripleo_ansible/roles/tripleo_create_admin/molecule/default/verify.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -# Copyright 2019 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. diff --git a/tripleo_ansible/roles/tripleo_create_admin/molecule/keygen/verify.yml b/tripleo_ansible/roles/tripleo_create_admin/molecule/keygen/verify.yml deleted file mode 100644 index dfd4c7352..000000000 --- a/tripleo_ansible/roles/tripleo_create_admin/molecule/keygen/verify.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -# Copyright 2019 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. diff --git a/tripleo_ansible/roles/tripleo_derived_parameters/molecule/default/verify.yml b/tripleo_ansible/roles/tripleo_derived_parameters/molecule/default/verify.yml deleted file mode 100644 index ede65b54e..000000000 --- a/tripleo_ansible/roles/tripleo_derived_parameters/molecule/default/verify.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -# Copyright 2020 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. diff --git a/tripleo_ansible/roles/tripleo_ha_wrapper/molecule/default/verify.yml b/tripleo_ansible/roles/tripleo_ha_wrapper/molecule/default/verify.yml deleted file mode 100644 index ede65b54e..000000000 --- a/tripleo_ansible/roles/tripleo_ha_wrapper/molecule/default/verify.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -# Copyright 2020 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. diff --git a/tripleo_ansible/roles/tripleo_nvdimm/molecule/default/verify.yml b/tripleo_ansible/roles/tripleo_nvdimm/molecule/default/verify.yml deleted file mode 100644 index ede65b54e..000000000 --- a/tripleo_ansible/roles/tripleo_nvdimm/molecule/default/verify.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -# Copyright 2020 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. diff --git a/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/verify.yml b/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/verify.yml deleted file mode 100644 index dfd4c7352..000000000 --- a/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/verify.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -# Copyright 2019 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. diff --git a/tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/verify.yml b/tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/verify.yml deleted file mode 100644 index dfd4c7352..000000000 --- a/tripleo_ansible/roles/tripleo_systemd_wrapper/molecule/default/verify.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -# Copyright 2019 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.