From: Andrew Schoen <aschoen@redhat.com>
Date: Wed, 27 Jan 2016 20:59:13 +0000 (-0600)
Subject: use variables to set extra-vars so they show up in console output
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3b5ad2f2c417d87a14e506b308e77ac9af6ba6f3;p=ceph-build.git

use variables to set extra-vars so they show up in console output

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
---

diff --git a/ceph-ansible-pull-requests/build/build b/ceph-ansible-pull-requests/build/build
index c5e777732..0e140c976 100644
--- a/ceph-ansible-pull-requests/build/build
+++ b/ceph-ansible-pull-requests/build/build
@@ -8,19 +8,28 @@ install_python_packages "pkgs[@]"
 # without our virtualenv activated it can not find it and fails
 source $VENV/activate
 
+devices='["/dev/vdb"]'
+ceph_stable="true"
+journal_collocation="true"
+journal_size=1024
+# use eth1 for libvirt and ubuntu, enp0s8 for CentOS
+monitor_interface="eth1"
+cluster_network="127.0.0.1/0"
+public_network="127.0.0.1/0"
+# the default settings include a setting for vm.min_free_kbytes which asks
+# for more memory than our jenkins slaves allow, so we remove it here
+os_tuning_params='[{"name": "kernel.pid_max", "value": 4194303},{"name": "fs.file-max", "value": 26234859}]'
+
 cat > $HOME/test-vars.json << EOF
 {
-    "devices":["/dev/vdb"],
-    "ceph_stable":true,
-    "journal_collocation":true,
-    "journal_size":1024,
-    "monitor_interface":"eth1",
-    "cluster_network":"127.0.0.1/0",
-    "public_network":"127.0.0.1/0",
-    "os_tuning_params":[
-        {"name": "kernel.pid_max", "value": 4194303},
-        {"name": "fs.file-max", "value": 26234859}
-    ]
+    "devices":$devices,
+    "ceph_stable":$ceph_stable,
+    "journal_collocation":$journal_collocation,
+    "journal_size":$journal_size,
+    "monitor_interface":"$monitor_interace",
+    "cluster_network":"$cluster_network",
+    "public_network":"$cluster_network",
+    "os_tuning_params":$os_tuning_params
 }
 EOF