From cf311222eab0be806989cc3495a76cc79c7712c0 Mon Sep 17 00:00:00 2001 From: Harry Huang Date: Sat, 25 Aug 2018 14:50:53 +0800 Subject: Add entry for stor4nfv scenario JIRA: - opensds.yml will always be execuated even if it's not stor4nfv scenario because of no condition check. Add an entry to control all stor4nfv tasks Change-Id: I329acb674dab5bc5644127a1d6846cf0b2e3522a Signed-off-by: Harry Huang --- plugins/stor4nfv/roles/os-stor4nfv/tasks/main.yml | 3 +-- plugins/stor4nfv/roles/os-stor4nfv/tasks/stor4nfv.yml | 12 ++++++++++++ plugins/stor4nfv/roles/stor4nfv/tasks/main.yml | 3 +-- plugins/stor4nfv/roles/stor4nfv/tasks/stor4nfv.yml | 12 ++++++++++++ 4 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 plugins/stor4nfv/roles/os-stor4nfv/tasks/stor4nfv.yml create mode 100644 plugins/stor4nfv/roles/stor4nfv/tasks/stor4nfv.yml (limited to 'plugins') diff --git a/plugins/stor4nfv/roles/os-stor4nfv/tasks/main.yml b/plugins/stor4nfv/roles/os-stor4nfv/tasks/main.yml index 060c9cf1..dbaa8d6b 100644 --- a/plugins/stor4nfv/roles/os-stor4nfv/tasks/main.yml +++ b/plugins/stor4nfv/roles/os-stor4nfv/tasks/main.yml @@ -7,8 +7,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 # ############################################################################# --- -- include: opensds.yml -- include: post-install.yml +- include: stor4nfv.yml when: - ansible_distribution == 'Ubuntu' - stor4nfv is defined and stor4nfv == "Enable" diff --git a/plugins/stor4nfv/roles/os-stor4nfv/tasks/stor4nfv.yml b/plugins/stor4nfv/roles/os-stor4nfv/tasks/stor4nfv.yml new file mode 100644 index 00000000..57bae793 --- /dev/null +++ b/plugins/stor4nfv/roles/os-stor4nfv/tasks/stor4nfv.yml @@ -0,0 +1,12 @@ +# ############################################################################# +# Copyright (c) 2018 Intel Corp. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +# ############################################################################# +--- +- include: opensds.yml + +- include: post-install.yml diff --git a/plugins/stor4nfv/roles/stor4nfv/tasks/main.yml b/plugins/stor4nfv/roles/stor4nfv/tasks/main.yml index 060c9cf1..7bc8ec06 100644 --- a/plugins/stor4nfv/roles/stor4nfv/tasks/main.yml +++ b/plugins/stor4nfv/roles/stor4nfv/tasks/main.yml @@ -7,8 +7,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 # ############################################################################# --- -- include: opensds.yml -- include: post-install.yml +- include: stor4nfv when: - ansible_distribution == 'Ubuntu' - stor4nfv is defined and stor4nfv == "Enable" diff --git a/plugins/stor4nfv/roles/stor4nfv/tasks/stor4nfv.yml b/plugins/stor4nfv/roles/stor4nfv/tasks/stor4nfv.yml new file mode 100644 index 00000000..57bae793 --- /dev/null +++ b/plugins/stor4nfv/roles/stor4nfv/tasks/stor4nfv.yml @@ -0,0 +1,12 @@ +# ############################################################################# +# Copyright (c) 2018 Intel Corp. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +# ############################################################################# +--- +- include: opensds.yml + +- include: post-install.yml -- cgit 1.2.3-korg