From: Tim Rozet <trozet@redhat.com>
Date: Wed, 23 Dec 2015 16:47:17 +0000 (-0500)
Subject: Adds deploy_settings and network_settings to deploy
X-Git-Tag: brahmaputra.1.0~348
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=af114946985ea7a93f87f4ed3a21c28a74d43d1d;p=releng.git

Adds deploy_settings and network_settings to deploy

Common deploy_settings and network_settings yaml files used in order to
provide options at deploy time and enable network isloation,
respectively.

Change-Id: Idd07fdb57ac33705a59f13fac5560f48247a2df5
Signed-off-by: Tim Rozet <trozet@redhat.com>
---

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 95055cb3e..48eedbb98 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -425,7 +425,7 @@
             # cleanup virtual machines before we start
             sudo opnfv-clean
             # initiate virtual deployment
-            sudo opnfv-deploy -v
+            sudo opnfv-deploy -v -d /usr/share/doc/opnfv/deploy_settings.yaml.example -n /usr/share/doc/opnfv/network_settings.yaml.example
 
             echo
             echo "--------------------------------------------------------"