Merge "set the openstack version for branch"

diff --combined jjb/global/slave-params.yml
index cdc08ea,8c3131e..5744222
--- 1/jjb/global/slave-params.yml
--- 2/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@@ -153,6 -153,26 +153,26 @@@
              name: GIT_BASE
              default: https://gerrit.opnfv.org/gerrit/$PROJECT
              description: 'Git URL to use on this Jenkins Slave'
+ - parameter:
+     name: 'compass-baremetal-master-defaults'
+     parameters:
+         - label:
+             name: SLAVE_LABEL
+             default: 'compass-baremetal-master'
+         - string:
+             name: GIT_BASE
+             default: https://gerrit.opnfv.org/gerrit/$PROJECT
+             description: 'Git URL to use on this Jenkins Slave'
+ - parameter:
+     name: 'compass-baremetal-branch-defaults'
+     parameters:
+         - label:
+             name: SLAVE_LABEL
+             default: 'compass-baremetal-branch'
+         - string:
+             name: GIT_BASE
+             default: https://gerrit.opnfv.org/gerrit/$PROJECT
+             description: 'Git URL to use on this Jenkins Slave'
  - parameter:
      name: 'fuel-baremetal-defaults'
      parameters:
@@@ -204,10 -224,6 +224,10 @@@
          - label:
              name: SLAVE_LABEL
              default: 'daisy-baremetal'
 +        - string:
 +            name: INSTALLER_IP
 +            default: '10.20.11.2'
 +            description: 'IP of the installer'
          - string:
              name: GIT_BASE
              default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@@ -239,6 -255,26 +259,26 @@@
              name: GIT_BASE
              default: https://gerrit.opnfv.org/gerrit/$PROJECT
              description: 'Git URL to use on this Jenkins Slave'
+ - parameter:
+     name: 'compass-virtual-master-defaults'
+     parameters:
+         - label:
+             name: SLAVE_LABEL
+             default: 'compass-virtual-master'
+         - string:
+             name: GIT_BASE
+             default: https://gerrit.opnfv.org/gerrit/$PROJECT
+             description: 'Git URL to use on this Jenkins Slave'
+ - parameter:
+     name: 'compass-virtual-branch-defaults'
+     parameters:
+         - label:
+             name: SLAVE_LABEL
+             default: 'compass-virtual-branch'
+         - string:
+             name: GIT_BASE
+             default: https://gerrit.opnfv.org/gerrit/$PROJECT
+             description: 'Git URL to use on this Jenkins Slave'
  - parameter:
      name: 'fuel-virtual-defaults'
      parameters:
@@@ -287,14 -323,6 +327,14 @@@
          - label:
              name: SLAVE_LABEL
              default: 'daisy-virtual'
 +        - string:
 +            name: INSTALLER_IP
 +            default: '10.20.11.2'
 +            description: 'IP of the installer'
 +        - string:
 +            name: BRIDGE
 +            default: 'daisy1'
 +            description: 'pxe bridge for booting of Fuel master'
          - string:
              name: GIT_BASE
              default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@@ -605,7 -633,7 +645,7 @@@
              description: 'Git URL to use on this Jenkins Slave'
          - string:
              name: INSTALLER_IP
 -            default: '10.20.7.2'
 +            default: '10.20.7.3'
              description: 'IP of the installer'
          - string:
              name: BRIDGE