replaces configure script with ciinaboxVPC step and allow override the branch of the bakery to checkout

Author: aaronwalker

vars/bakeAMI.groovy

@@ -52,13 +52,13 @@ def call(body) {
   node {
     println "bake config:${config}"
     deleteDir()
-    git(url: 'https://github.com/base2Services/ciinabox-bakery.git', branch: 'master')
+    git(url: 'https://github.com/base2Services/ciinabox-bakery.git', branch: config.get('ciinaboxBakeryBranch', 'master'))
     def sourceAMI = lookupAMI config
     def branchName = env.BRANCH_NAME.replaceAll("/", "-")
     bakeEnv << "SOURCE_AMI=${sourceAMI}"
     bakeEnv << "BRANCH=${branchName}"
     withEnv(bakeEnv) {
-      sh './configure $CIINABOX_NAME $REGION $AMI_USERS'
+      ciinaboxVPC config
 
       if(skipCookbookUpload) {
         sh 'mkdir -p cookbooks'
@@ -76,6 +76,7 @@ def call(body) {
       '''
       sh '''#!/bin/bash
       AMI_BUILD_ID=${BRANCH}-${AMI_BUILD_NUMBER}
+      OPT_VARS="-var ami_users=${AMI_USERS}"
       echo "==================================================="
       echo "Baking AMI: ${ROLE}"
       exho "AMI Build NO: ${AMI_BUILD_ID}"