Merge lp:~et1337/charms/precise/couchbase/update-2.0 into lp:charms/couchbase

[et1337]

Update for Couchbase 2.0 stable

Updates the charm to point to Couchbase 2.0 stable rather than the beta. Also allows users to choose any permutation of 1.8/2.0 and enterprise/community.

[Juan L. Negron (negronjl)]

Reviewing this now.

-Juan

[Juan L. Negron (negronjl)]

Looks good to me .... approving.

-Juan

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2012-04-12 15:46:33 +0000
+++ config.yaml	2013-02-11 18:05:46 +0000
@@ -1,8 +1,8 @@
 options:
   couchbase_version:
-    default: stable
+    default: community-2.0
     type: string
-    description: Couchbase version to install. ( stable or devel )
+    description: Couchbase version to install. ("community-2.0", "community-1.8", "enterprise-2.0", or "enterprise-1.8")
   cluster_username:
     default: Administrator
     type: string
 
=== modified file 'hooks/install'
--- hooks/install	2012-04-12 15:46:33 +0000
+++ hooks/install	2013-02-11 18:05:46 +0000
@@ -26,8 +26,24 @@
 COUCHBASE_IP=`facter ipaddress`
 COUCHBASE_UUID=`uuid`
 COUCHBASE_VERSION=`config-get couchbase_version`
-COUCHBASE_URL="http://packages.couchbase.com/releases/1.8.0/couchbase-server-community_${ARCH}_1.8.0.deb"
-[ "${COUCHBASE_VERSION}" == "devel" ] && COUCHBASE_URL="http://packages.couchbase.com/releases/2.0.0-developer-preview-4/couchbase-server-community_${ARCH}_2.0.0-dev-preview-4.deb"
+
+COUCHBASE_URL_BASE="http://packages.couchbase.com/releases/"
+case $COUCHBASE_VERSION in
+	community-2.0)
+		COUCHBASE_URL_PATH="2.0.0/couchbase-server-community_${ARCH}_2.0.0.deb"
+		;;
+	community-1.8)
+		COUCHBASE_URL_PATH="1.8.1/couchbase-server-community_${ARCH}_1.8.1.deb"
+		;;
+	enterprise-2.0)
+		COUCHBASE_URL_PATH="2.0.0/couchbase-server-enterprise_${ARCH}_2.0.0.deb"
+		;;
+	enterprise-1.8)
+		COUCHBASE_URL_PATH="1.8.1/couchbase-server-enterprise_x86_64_1.8.1.deb"
+		;;
+esac
+
+COUCHBASE_URL="${COUCHBASE_URL_BASE}${COUCHBASE_URL_PATH}"
 
 if [ "${COUCHBASE_BUCKET}" == "auto" ]; then
 	COUCHBASE_BUCKET=`pwgen -N1`