aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/barometer/roles/collectd/templates/collectd-gnocchi.conf.j22
-rwxr-xr-xplugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-3.yml7
-rwxr-xr-xplugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-post.yml18
-rw-r--r--plugins/stor4nfv/roles/stor4nfv/tasks/main.yml1
-rw-r--r--plugins/stor4nfv/roles/stor4nfv/tasks/nbp.yml27
-rw-r--r--plugins/stor4nfv/roles/stor4nfv/templates/nbp.hosts.j24
6 files changed, 59 insertions, 0 deletions
diff --git a/plugins/barometer/roles/collectd/templates/collectd-gnocchi.conf.j2 b/plugins/barometer/roles/collectd/templates/collectd-gnocchi.conf.j2
index 79e2872e..22dd7966 100644
--- a/plugins/barometer/roles/collectd/templates/collectd-gnocchi.conf.j2
+++ b/plugins/barometer/roles/collectd/templates/collectd-gnocchi.conf.j2
@@ -16,6 +16,8 @@
# Batch size
BATCH_SIZE "1"
+ DEFAULT_ARCHIVE_POLICY "high"
+
# Service endpoint addresses
OS_AUTH_URL "http://{{ internal_vip.ip }}:35357/v3/"
diff --git a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-3.yml b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-3.yml
index c4451ca2..1eb68871 100755
--- a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-3.yml
+++ b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/control-servers-3.yml
@@ -26,3 +26,10 @@
become: "yes"
become_user: "neutron"
when: odl_sfc == "Enable"
+
+- name: fetch ml2_conf.ini to compass-tasks
+ fetch:
+ src: /etc/neutron/plugins/ml2/ml2_conf.ini
+ dest: /tmp/
+ flat: "yes"
+ when: odl_sfc == "Enable"
diff --git a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-post.yml b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-post.yml
index 9f1cb79e..55b0e160 100755
--- a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-post.yml
+++ b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-post.yml
@@ -32,3 +32,21 @@
- name: restart opendaylight
shell: sleep 60; service opendaylight restart; sleep 60;
when: inventory_hostname in groups['network_hosts']
+
+- name: creat ml2 directory on ODL hosts
+ file:
+ path: /etc/neutron/plugins/ml2/
+ state: directory
+ mode: 0755
+ when:
+ - inventory_hostname in groups['network_hosts']
+ - odl_sfc == "Enable"
+
+- name: copy ml2_conf.ini to ODL hosts
+ copy:
+ src: /tmp/ml2_conf.ini
+ dest: /etc/neutron/plugins/ml2/ml2_conf.ini
+ mode: 0755
+ when:
+ - inventory_hostname in groups['network_hosts']
+ - odl_sfc == "Enable"
diff --git a/plugins/stor4nfv/roles/stor4nfv/tasks/main.yml b/plugins/stor4nfv/roles/stor4nfv/tasks/main.yml
index 353282f9..89d13f41 100644
--- a/plugins/stor4nfv/roles/stor4nfv/tasks/main.yml
+++ b/plugins/stor4nfv/roles/stor4nfv/tasks/main.yml
@@ -8,6 +8,7 @@
# #############################################################################
---
- 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
new file mode 100644
index 00000000..5361f5cd
--- /dev/null
+++ b/plugins/stor4nfv/roles/stor4nfv/tasks/nbp.yml
@@ -0,0 +1,27 @@
+# #############################################################################
+# 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/templates/nbp.hosts.j2 b/plugins/stor4nfv/roles/stor4nfv/templates/nbp.hosts.j2
new file mode 100644
index 00000000..0e8fa4c9
--- /dev/null
+++ b/plugins/stor4nfv/roles/stor4nfv/templates/nbp.hosts.j2
@@ -0,0 +1,4 @@
+[worker-nodes]
+{% for worker in hostvars[inventory_hostname]['groups']['storage_master'] %}
+{{ worker }} ansible_ssh_host={{ hostvars[worker]['ansible_ssh_host'] }}
+{% endfor %}