@@ -607,7 +607,7 @@ IRONIC_PYTHON_AGENT_BRANCH=${IRONIC_PYTHON_AGENT_BRANCH:-master}

 # a websockets/html5 or flash powered VNC console for vm instances

 NOVNC_REPO=${NOVNC_REPO:-https://github.com/kanaka/noVNC.git}

-NOVNC_BRANCH=${NOVNC_BRANCH:-master}

+NOVNC_BRANCH=${NOVNC_BRANCH:-stable/v0.6}

 # a websockets/html5 or flash powered SPICE console for vm instances

 SPICE_REPO=${SPICE_REPO:-http://anongit.freedesktop.org/git/spice/spice-html5.git}

@@ -15,7 +15,7 @@

 echo "Ensuring we don't have crazy refs"

-REFS=`grep BRANCH stackrc | grep -v -- '-master'`

+REFS=`grep BRANCH stackrc | grep -v -- '-master' | grep -v 'NOVNC_BRANCH'`

 rc=$?

 if [[ $rc -eq 0 ]]; then

     echo "Branch defaults must be master. Found:"