X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fansible%2Froles%2Fosdsdb%2Ftasks%2Fmain.yml;h=f8fa944ea07e490238c01eb1a6fc3c89cad0f95b;hb=4ced57eae63a52ea517d4087662726d942da8441;hp=03530b449db40185c9ef837a832d0558c59dc3ba;hpb=b9f16e2669ff5a0cde006951ffec5dff84ac29df;p=stor4nfv.git diff --git a/ci/ansible/roles/osdsdb/tasks/main.yml b/ci/ansible/roles/osdsdb/tasks/main.yml old mode 100755 new mode 100644 index 03530b4..f8fa944 --- a/ci/ansible/roles/osdsdb/tasks/main.yml +++ b/ci/ansible/roles/osdsdb/tasks/main.yml @@ -1,8 +1,25 @@ ---- -- name: include scenarios/etcd.yml - include: scenarios/etcd.yml - when: db_driver == "etcd" and container_enabled == false - -- name: include scenarios/container.yml - include: scenarios/container.yml - when: db_driver == "etcd" and container_enabled == true +# Copyright (c) 2018 Huawei Technologies Co., Ltd. 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. + +--- +- name: include scenarios/etcd.yml + include: "{{ item }}" + with_first_found: + - "scenarios/etcd_{{ ansible_architecture }}.yml" + - "scenarios/etcd.yml" + when: db_driver == "etcd" and etcd_container_enabled == false + +- name: include scenarios/container.yml + include: scenarios/container.yml + when: db_driver == "etcd" and etcd_container_enabled == true