Merge pull request #150 from feiskyer/fix-install

Fix hypernetes install and upgrade to v1.3.1

Author: feiskyer

hack/hypernetes/README.md

@@ -11,7 +11,7 @@ Note: The script should be run as `root`.
 1. Setup environment variables:
 
 ```sh
-export HOSTNAME="k8s"
+export HOSTNAME=$(hostname)
 export IF_NAME="eth0"
 export IF_IP=""
 export GOPATH="/gopath"
@@ -47,6 +47,6 @@ yum -y update
 
 ### Install failed due to slow network
 
-For slow networks, the installation may fail with timeout. When this happens, just comment out successed steps from `hack/local-up-hypernetes.sh` and re-run the script to continue the installation.
+For slow networks, the installation may fail with timeout. When this happens, just run the `hack/local-up-hypernetes.sh` script again to continue the installation.
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/hack/hypernetes/README.md?pixel)]()

hack/hypernetes/ceph.sh

@@ -42,6 +42,7 @@ function kube::util::do_setup_ceph() {
 	cd /root/ceph-cluster
 	ceph-deploy new $HOSTNAME
 	echo "osd pool default size = 1" >> ceph.conf
+  echo "rbd default features = 3" >> ceph.conf
 
 	ceph-deploy install $HOSTNAME
 
@@ -66,7 +67,7 @@ function kube::util::setup_cinder() {
 
 	## create pool for cinder
 	ceph osd pool create cinder 256 256
-	rbd feature disable cinder exclusive-lock object-map fast-diff deep-flatten
+	#rbd feature disable cinder exclusive-lock object-map fast-diff deep-flatten
 	ceph auth get-or-create client.cinder mon 'allow r' osd 'allow class-read object_prefix rbd_children, allow rwx pool=cinder'
 
 	## auth for cinder
@@ -93,7 +94,8 @@ EOF
 	sed -i 's/^enabled_backends.*$/enabled_backends = ceph/g' /etc/cinder/cinder.conf
 
 	systemctl | awk '/cinder/{print $1}' | while read line; do
-	    systemctl restart $line
+		echo "Restarting $line ..."
+		systemctl restart $line
 	done
 }
 

hack/hypernetes/hypernetes.sh

@@ -21,9 +21,11 @@ set -o pipefail
 function kube::util::download_hypernetes() {
 	echo "Start $FUNCNAME"
 	yum -y install kubernetes etcd
-	curl -p -SL https://github.com/hyperhq/hypernetes/releases/download/v1.2.0/kubernetes-server-linux-amd64.tar.gz -o /tmp/kubernetes-server-linux-amd64.tar.gz
-	tar zxvf /tmp/kubernetes-server-linux-amd64.tar.gz -C /usr/bin/
-	rm -f /tmp/kubernetes-server-linux-amd64.tar.gz
+	curl -p -SL https://github.com/hyperhq/hypernetes/releases/download/v1.3.1/kubernetes-server-linux-amd64.tar.gz -o /tmp/kubernetes-server-linux-amd64.tar.gz
+  cd /tmp
+	tar zxvf /tmp/kubernetes-server-linux-amd64.tar.gz
+  /bin/cp -f /tmp/kubernetes/server/bin/* /usr/bin/
+	rm -rf /tmp/kubernetes-server-linux-amd64.tar.gz /tmp/kubernetes
 }
 
 function kube::util::build_hypernetes() {

hack/hypernetes/openstack.sh

@@ -23,7 +23,7 @@ function kube::util::setup_openstack() {
 
 	# make sure yum is not running
 	kube::util::ensure_yum_ready
-	yum install -y centos-release-openstack-mitaka
+	yum install -y centos-release-openstack-mitaka epel-release
 	yum update -y
 	yum install -y openstack-packstack
 
@@ -43,6 +43,7 @@ function kube::util::setup_openstack() {
 	sed -i 's/CONFIG_AODH_INSTALL=y/CONFIG_AODH_INSTALL=n/g' /root/packstack_answer_file.txt
 	sed -i 's/CONFIG_GNOCCHI_INSTALL=y/CONFIG_GNOCCHI_INSTALL=n/g' /root/packstack_answer_file.txt
 	sed -i 's/CONFIG_GLANCE_INSTALL=y/CONFIG_GLANCE_INSTALL=n/g' /root/packstack_answer_file.txt
+	sed -i 's/CONFIG_USE_EPEL=n/CONFIG_USE_EPEL=y/g' /root/packstack_answer_file.txt
 
 	# Install OpenStack
 	packstack --answer-file=/root/packstack_answer_file.txt
@@ -64,5 +65,7 @@ function kube::util::setup_openstack() {
 function kube::util::clean_neutron_resource() {
 	local tenant_name=$1
 	local tenant_id=`keystone tenant-list 2>/dev/null | grep ${tenant_name} | awk '{print $2}'`
-	neutron purge $tenant_id
+	if [ "${tenant_id}" != "" ]; then
+		neutron purge ${tenant_id}
+	fi
 }

hack/hypernetes/util.sh

@@ -78,7 +78,7 @@ EOF
 function kube::util::install_golang() {
 	echo "Start $FUNCNAME"
 	yum -y install git
-	curl -L https://storage.googleapis.com/golang/go1.6.3.linux-amd64.tar.gz | tar -C /usr/local -zxf -
+	curl -L https://storage.googleapis.com/golang/go1.7.1.linux-amd64.tar.gz | tar -C /usr/local -zxf -
 	echo 'export GOPATH=/gopath/' >> /root/.bashrc
 	echo 'export PATH=$PATH:$GOPATH/bin:/usr/local/bin:/usr/local/go/bin/' >> /root/.bashrc
 	go get github.com/tools/godep