X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fglobal%2Finstaller-params.yml;h=683ef78babc2c3ab702b65bdb933196867bcc835;hb=5df2b2bbac0d5ad63874ebbeb447ab140bdf03f2;hp=b64a41e9186de0fbfecce8465631c8b3539be855;hpb=a6241f704f8f8563d7e8fa398f1241fac7031b62;p=releng.git diff --git a/jjb/global/installer-params.yml b/jjb/global/installer-params.yml index b64a41e91..683ef78ba 100644 --- a/jjb/global/installer-params.yml +++ b/jjb/global/installer-params.yml @@ -38,10 +38,6 @@ name: INSTALLER_IP 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: SSH_KEY default: "/var/lib/opnfv/mcp.rsa" @@ -52,16 +48,16 @@ description: 'Installer used for deploying OPNFV on this POD' - string: name: EXTERNAL_NETWORK - default: 'admin_floating_net' + default: 'floating_net' description: 'external network for test' - - string: - name: BRIDGE - default: 'pxebr' - description: 'Bridge(s) to be used by salt master' - string: name: GS_URL default: '$GS_BASE{gs-pathname}' description: "URL to Google Storage." + - string: + name: CI_DEBUG + default: 'false' + description: "Show debug output information" - parameter: name: 'joid-defaults' @@ -80,8 +76,8 @@ description: 'Model to deploy (os|k8)' - string: name: OS_RELEASE - default: 'ocata' - description: 'OpenStack release (mitaka|newton|ocata)' + default: 'pike' + description: 'OpenStack release (mitaka|ocata|pike)' - string: name: EXTERNAL_NETWORK default: ext-net @@ -118,6 +114,10 @@ name: BRIDGE default: 'br7' description: 'pxe bridge for booting of Daisy master' + - string: + name: EXTERNAL_NETWORK + default: 'admin_external' + description: 'external network for test' - parameter: name: 'infra-defaults'