Merge "docs: fix setuptools problems"

diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml
index e03b474..57ca986 100644 (file)
--- a/jjb/opnfv/installer-params.yml
+++ b/jjb/opnfv/installer-params.yml
@@ -47,7 +47,7 @@
             description: 'Installer used for deploying OPNFV on this POD'
         - string:
             name: EXTERNAL_NETWORK
-            default: 'net04_ext'
+            default: 'admin_floating_net'
             description: 'external network for test'
 
 - parameter:

diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index b2c6e7c..e1f9e44 100644 (file)
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -81,10 +81,6 @@
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-        - string:
-            name: EXTERNAL_NETWORK
-            default: 'admin_floating_net'
-            description: 'external network'
 
 - parameter:
     name: 'intelpod2-jumphost-defaults'