summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2017-06-19 07:52:00 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-06-19 07:52:00 +0000
commita49f77e37308ffc33d466240279000c607c9a94f (patch)
treeebf1a790385b4bf557e4bd2ccb9bae05d6f84792 /jjb
parentabbf19fc005ef6df0dcbba28d4bc8bd2a3365a41 (diff)
parent8359219bae93a028f6205cdc9460654f9e45c217 (diff)
Merge "Fuel: adds retrieving OS credentials for MCP"
Diffstat (limited to 'jjb')
-rw-r--r--jjb/fuel/fuel-daily-jobs.yml4
-rw-r--r--jjb/global/installer-params.yml4
2 files changed, 8 insertions, 0 deletions
diff --git a/jjb/fuel/fuel-daily-jobs.yml b/jjb/fuel/fuel-daily-jobs.yml
index dd0590c72..68677089d 100644
--- a/jjb/fuel/fuel-daily-jobs.yml
+++ b/jjb/fuel/fuel-daily-jobs.yml
@@ -293,6 +293,10 @@
name: GS_URL
default: artifacts.opnfv.org/$PROJECT{gs-pathname}
description: "URL to Google Storage."
+ - string:
+ name: SSH_KEY
+ default: "/tmp/mcp.rsa"
+ description: "Path to private SSH key to access environment nodes. For MCP deployments only."
########################
# trigger macros
########################
diff --git a/jjb/global/installer-params.yml b/jjb/global/installer-params.yml
index 40fc42c76..e9f48aea1 100644
--- a/jjb/global/installer-params.yml
+++ b/jjb/global/installer-params.yml
@@ -38,6 +38,10 @@
default: '10.20.0.2'
description: 'IP of the installer'
- string:
+ name: SALT_MASTER_IP
+ default: '192.168.10.100'
+ description: 'IP of the salt master (for mcp deployments)'
+ - string:
name: INSTALLER_TYPE
default: fuel
description: 'Installer used for deploying OPNFV on this POD'