Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Patched charm with latest changes from Couchbase/Steve Yen

  • Loading branch information...
commit ff0c0a62a92f145fd442f29e66754bcddf1eb816 1 parent 0ed87d3
Juan L. Negron authored
View
4 config.yaml
@@ -36,6 +36,6 @@ options:
type: int
description: Bucket replica factor.
bucket_type:
- default: membase
+ default: couchbase
type: string
- description: The type of bucket to create. Options are 'membase' or 'memcached'.
+ description: The type of bucket to create. Options are 'couchbase' or 'memcached'.
View
2  hooks/cluster-relation-changed
@@ -19,7 +19,7 @@ done
if [ ${JUJU_UNIT_NAME} != ${MASTER_MEMBER} ]; then
# I am not the master node so, I need to join up with the master node
- /opt/couchbase/bin/membase rebalance \
+ /opt/couchbase/bin/couchbase-cli rebalance \
-u `relation-get username ${MASTER_MEMBER}` -p `relation-get password ${MASTER_MEMBER}` \
-c `relation-get ip ${MASTER_MEMBER}` \
--server-add=`facter couchbase-ip` \
View
13 hooks/install
@@ -42,23 +42,26 @@ ARCH=`uname -m`
mkdir -p ${CWD}/../packages
cd ${CWD}/../packages
-curl -O http://people.canonical.com/~negronjl/couchbase-server-community_${ARCH}_2.0.0r-1-ge4c8742.deb || exit 1
-dpkg -i couchbase-server-community_${ARCH}_2.0.0r-1-ge4c8742.deb
+
+# ARCH must be either x86_64 or x86.
+curl -O http://packages.couchbase.com/releases/2.0.0-developer-preview-4/couchbase-server-community_${ARCH}_2.0.0-dev-preview-4.deb || exit 1
+
+dpkg -i couchbase-server-community_${ARCH}_2.0.0-dev-preview-4.deb
service couchbase-server status && service couchbase-server restart || service couchbase-server start
-/opt/couchbase/bin/membase cluster-init \
+/opt/couchbase/bin/couchbase-cli cluster-init \
-c ${COUCHBASE_IP}:${COUCHBASE_PORT} \
--cluster-init-username=${DEFAULT_CLUSTER_USERNAME} \
--cluster-init-password=${DEFAULT_CLUSTER_PASSWORD} \
--cluster-init-port=${COUCHBASE_PORT} \
--cluster-init-ramsize=${COUCHBASE_CLUSTER_RAMSIZE}
-/opt/couchbase/bin/membase bucket-create -c ${COUCHBASE_IP}:${COUCHBASE_PORT} \
+/opt/couchbase/bin/couchbase-cli bucket-create -c ${COUCHBASE_IP}:${COUCHBASE_PORT} \
-u ${DEFAULT_CLUSTER_USERNAME} -p ${DEFAULT_CLUSTER_PASSWORD} \
--bucket=${COUCHBASE_BUCKET} \
--bucket-type=${COUCHBASE_BUCKET_TYPE} \
- --bucket-password= ${COUCHBASE_BUCKET_PASSWORD}\
+ --bucket-password=${COUCHBASE_BUCKET_PASSWORD} \
--bucket-ramsize=${COUCHBASE_BUCKET_RAMSIZE} \
--bucket-replica=${COUCHBASE_BUCKET_REPLICA}
View
4 metadata.yaml
@@ -1,10 +1,10 @@
name: couchbase
-summary: Membase Server
+summary: Couchbase Server
description: |
Couchbase Server 2.0 is a distributed, document-oriented NoSQL
database system that unites the simplicity and reliability of
CouchDB, with the performance of Memcached and elasticity of
- Membase technology.
+ Couchbase technology.
provides:
db:
interface: couchbase
View
2  revision
@@ -1 +1 @@
-5
+6
Please sign in to comment.
Something went wrong with that request. Please try again.