diff options
Diffstat (limited to 'plugins/stor4nfv/roles/stor4nfv/tasks')
| -rw-r--r-- | plugins/stor4nfv/roles/stor4nfv/tasks/main.yml | 1 | ||||
| -rw-r--r-- | plugins/stor4nfv/roles/stor4nfv/tasks/nbp.yml | 27 | ||||
| -rw-r--r-- | plugins/stor4nfv/roles/stor4nfv/tasks/opensds.yml | 4 |
3 files changed, 2 insertions, 30 deletions
diff --git a/plugins/stor4nfv/roles/stor4nfv/tasks/main.yml b/plugins/stor4nfv/roles/stor4nfv/tasks/main.yml index 89d13f41..353282f9 100644 --- a/plugins/stor4nfv/roles/stor4nfv/tasks/main.yml +++ b/plugins/stor4nfv/roles/stor4nfv/tasks/main.yml @@ -8,7 +8,6 @@ # ############################################################################# --- - include: opensds.yml -- include: nbp.yml when: - ansible_distribution == 'Ubuntu' - stor4nfv is defined and stor4nfv == "Enable" diff --git a/plugins/stor4nfv/roles/stor4nfv/tasks/nbp.yml b/plugins/stor4nfv/roles/stor4nfv/tasks/nbp.yml deleted file mode 100644 index 5361f5cd..00000000 --- a/plugins/stor4nfv/roles/stor4nfv/tasks/nbp.yml +++ /dev/null @@ -1,27 +0,0 @@ -# ############################################################################# -# 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 -# ############################################################################# ---- - -- name: render nbp inventory - remote_user: root - template: - src: nbp.hosts.j2 - dest: $HOME/gopath/src/github.com/stor4nfv/stor4nfv/ci/nbp-ansible/nbp.hosts - -- name: set nbp to csi - remote_user: root - shell: | - cd $HOME/gopath/src/github.com/stor4nfv/stor4nfv/ci/nbp-ansible; - sed -i 's/^nbp_plugin_type.*/nbp_plugin_type: csi/g' group_vars/common.yml - -- name: run playbook - remote_user: root - shell: | - cd $HOME/gopath/src/github.com/stor4nfv/stor4nfv/ci/nbp-ansible; - ansible-playbook site.yml -i nbp.hosts | tee /var/log/stor4nfv-nbp.log diff --git a/plugins/stor4nfv/roles/stor4nfv/tasks/opensds.yml b/plugins/stor4nfv/roles/stor4nfv/tasks/opensds.yml index afd65bc7..7866e808 100644 --- a/plugins/stor4nfv/roles/stor4nfv/tasks/opensds.yml +++ b/plugins/stor4nfv/roles/stor4nfv/tasks/opensds.yml @@ -57,10 +57,10 @@ src: ceph.hosts.j2 dest: $HOME/gopath/src/github.com/stor4nfv/stor4nfv/ci/ansible/group_vars/ceph/ceph.hosts -- name: render opensds inventory +- name: render opensds, nbp inventory remote_user: root template: - src: opensds.hosts.j2 + src: opensds-nbp.hosts.j2 dest: $HOME/gopath/src/github.com/stor4nfv/stor4nfv/ci/ansible/local.hosts - name: force to run the second etcd cluster |