Merge "Fix errors for Ambari jobs"

config/zuul/layout.yaml

@@ -122,6 +122,6 @@ jobs:
     voting: false
   - name: ^.*-nova-heat-hdp_2.0.6-c6.6$
     voting: false
-  - name: ^-nova-heat-ambari_2.1-.*$
+  - name: ^.*-nova-heat-ambari_2.1-.*$
     voting: false
     branch: master

jenkins_job_builder/diskimage.yaml

@@ -59,7 +59,7 @@
      - 'dib-{network}-{engine}-{plugin}-{os}':
           plugin: mapr_4.0.2.mrv2
           os: u14
-     - 'dib-{network}-{engine}-{plugin}-{os}-aio':
+     - 'dib-{network}-{engine}-{plugin}-{os}':
           network: nova
           plugin: ambari_2.1
           os:

slave-scripts/dib.sh

@@ -107,7 +107,7 @@ case $plugin in
     ;;
 
     ambari_2.1)
-       env ambari_${os_type}_image_name=${ambari_2_1_image} SIM_REPO_PATH=$WORKSPACE tox -e venv -- sahara-image-create -p ambari -i $os_type -v 2.1
+       env ambari_${os_type}_image_name=${ambari_2_1_image} SIM_REPO_PATH=$WORKSPACE tox -e venv -- sahara-image-create -p ambari -i $os_type -v 2.1.0
        check_error_code $? ${ambari_2_1_image}.qcow2
        upload_image "${plugin}" "${username}" ${ambari_2_1_image}
        scenario_conf_file="$sahara_templates_path/ambari-2.1.yaml.mako"