aboutsummaryrefslogtreecommitdiffstats
path: root/resources/ansible_roles
diff options
context:
space:
mode:
Diffstat (limited to 'resources/ansible_roles')
-rw-r--r--resources/ansible_roles/opnfv-testapi/tasks/report.yml2
-rw-r--r--resources/ansible_roles/qtip-generator/defaults/main.yml1
-rw-r--r--resources/ansible_roles/qtip-generator/files/compute/group_vars/all.yml1
-rw-r--r--resources/ansible_roles/qtip-generator/files/compute/host_vars/localhost.yml2
-rw-r--r--resources/ansible_roles/qtip/tasks/gather-facts-mcp.yml14
-rw-r--r--resources/ansible_roles/ramspeed/tasks/main.yml4
6 files changed, 21 insertions, 3 deletions
diff --git a/resources/ansible_roles/opnfv-testapi/tasks/report.yml b/resources/ansible_roles/opnfv-testapi/tasks/report.yml
index bb034d84..0633eafb 100644
--- a/resources/ansible_roles/opnfv-testapi/tasks/report.yml
+++ b/resources/ansible_roles/opnfv-testapi/tasks/report.yml
@@ -26,6 +26,6 @@
scenario: "{{ scenario }}"
start_date: "{{ ansible_date_time.date }}"
stop_date: "{{ ansible_date_time.date }}"
- criteria: "{{ pod_result.score }}"
+ criteria: PASS # regarded as "pass" if execution is done
details:
score: "{{ pod_result.score }}"
diff --git a/resources/ansible_roles/qtip-generator/defaults/main.yml b/resources/ansible_roles/qtip-generator/defaults/main.yml
index 527da6f7..f6714b8d 100644
--- a/resources/ansible_roles/qtip-generator/defaults/main.yml
+++ b/resources/ansible_roles/qtip-generator/defaults/main.yml
@@ -14,6 +14,7 @@ installer_group:
manual: dummy-group
fuel: fuel-masters
apex: apex-underclouds
+ mcp: salt-masters
project_name: 'qtip-project'
project_template: 'compute'
diff --git a/resources/ansible_roles/qtip-generator/files/compute/group_vars/all.yml b/resources/ansible_roles/qtip-generator/files/compute/group_vars/all.yml
index 8b90b498..efb2bdb7 100644
--- a/resources/ansible_roles/qtip-generator/files/compute/group_vars/all.yml
+++ b/resources/ansible_roles/qtip-generator/files/compute/group_vars/all.yml
@@ -20,3 +20,4 @@ installer_group:
manual: dummy-group
fuel: fuel-masters
apex: apex-underclouds
+ mcp: salt-master
diff --git a/resources/ansible_roles/qtip-generator/files/compute/host_vars/localhost.yml b/resources/ansible_roles/qtip-generator/files/compute/host_vars/localhost.yml
index 815e2ea3..cc587c69 100644
--- a/resources/ansible_roles/qtip-generator/files/compute/host_vars/localhost.yml
+++ b/resources/ansible_roles/qtip-generator/files/compute/host_vars/localhost.yml
@@ -13,4 +13,4 @@ project_name: qtip
case_name: "{{ case_name|default('compute') }}"
pod_name: "{{ pod_name|default('qtip-pod') }}"
scenario: "{{ scenario|default('generic') }}"
-version: "{{ version|default('master') }}"
+version: "{{ lookup('env','OPNFV_RELEASE')|default('master') }}"
diff --git a/resources/ansible_roles/qtip/tasks/gather-facts-mcp.yml b/resources/ansible_roles/qtip/tasks/gather-facts-mcp.yml
new file mode 100644
index 00000000..5aed9e75
--- /dev/null
+++ b/resources/ansible_roles/qtip/tasks/gather-facts-mcp.yml
@@ -0,0 +1,14 @@
+##############################################################################
+# Copyright (c) 2017 ZTE Corporation and others.
+# taseer94@gmail.com
+#
+# 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: gathering facts for mcp slave nodes
+ mcp: \ No newline at end of file
diff --git a/resources/ansible_roles/ramspeed/tasks/main.yml b/resources/ansible_roles/ramspeed/tasks/main.yml
index dbf16567..6f0b10fc 100644
--- a/resources/ansible_roles/ramspeed/tasks/main.yml
+++ b/resources/ansible_roles/ramspeed/tasks/main.yml
@@ -14,7 +14,9 @@
- name: downloading ramsmp
get_url:
- url: http://www.alasir.com/software/ramspeed/ramsmp-3.5.0.tar.gz
+# alasir.com domain name expired on 2017-09-30 05:47:11
+# url: http://www.alasir.com/software/ramspeed/ramsmp-3.5.0.tar.gz
+ url: http://sources.buildroot.net/ramsmp-3.5.0.tar.gz
dest: "{{ workdir }}"
checksum: "sha256:39fb15493fb3c293575746d56f6ab9faaa1d876d8b1f0d8e5a4042d2ace95839"