minor fixes

Author: travisghansen

.travis.yml

@@ -32,7 +32,8 @@ deploy:
   skip_cleanup: true
   on:
     repo: travisghansen/freenas-iscsi-provisioner
-    branch: "master"
+    all_branches: true
+    condition: $TRAVIS_BRANCH =~ ^master|next$
 
 - provider: script
   script: bash .travis/docker-release.sh

.travis/docker-release.sh

@@ -5,9 +5,14 @@ echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
 if [[ -n "${TRAVIS_TAG}" ]];then
 	docker build --pull -t travisghansen/freenas-iscsi-provisioner:${TRAVIS_TAG} .
 	docker push travisghansen/freenas-iscsi-provisioner:${TRAVIS_TAG}
-elif [[ "${TRAVIS_BRANCH}" == "master" ]];then
-	docker build --pull -t travisghansen/freenas-iscsi-provisioner:latest .
-	docker push travisghansen/freenas-iscsi-provisioner:latest
+elif [[ -n "${TRAVIS_BRANCH}" ]];then
+	if [[ "${TRAVIS_BRANCH}" == "master" ]];then
+		docker build --pull -t travisghansen/freenas-iscsi-provisioner:latest .
+		docker push travisghansen/freenas-iscsi-provisioner:latest
+	else
+		docker build --pull -t travisghansen/freenas-iscsi-provisioner:${TRAVIS_BRANCH} .
+		docker push travisghansen/freenas-iscsi-provisioner:${TRAVIS_BRANCH}
+	fi
 else
 	:
 fi

deploy/class.yaml

@@ -29,7 +29,7 @@ parameters:
   # the name of the parent dataset (or simply pool) where all resources will
   # be created, it *must* exist before provisioner will work
   # Note: due to length limitations with iscsi the total string length must
-  # NOT exceed 22 chars (this includes slashes etc)
+  # NOT exceed 17 chars (this includes slashes etc)
   # example: tank/k8s/mycluster
   # default: tank
   #datasetParentName:

freenas/iscsi_config.go

@@ -2,6 +2,8 @@ package freenas
 
 import (
 	"errors"
+	"fmt"
+	"io/ioutil"
 	"net/http"
 
 	"github.com/golang/glog"
@@ -42,6 +44,11 @@ func (i *ISCSIConfig) Get(server *Server) (*http.Response, error) {
 		return resp, err
 	}
 
+	if resp.StatusCode != 200 {
+		body, _ := ioutil.ReadAll(resp.Body)
+		return resp, fmt.Errorf("Error getting iscsi_config - message: %v, status: %d", body, resp.StatusCode)
+	}
+
 	i.CopyFrom(&iscsiConfig)
 
 	return resp, nil