Merge lp:~celebdor/charms/precise/cassandra/hostname_resolve into lp:charms/cassandra

[Antoni Segura Puimedon]

see commit msg.

[Matt Bruzek (mbruzek)]

Hello Antoni,

Thank you for submitting this fix. It is my understanding this fix allows cassandra to be installed on LXC.

The code adds a configuration option that is only evaluated at install time. If the customer were to change the package_version after install the operation would have no effect. This is what we call "immutable configuration". This is because "config-changed" is the only hook called when the Juju user changes the configuration in the GUI or on the command line.

If you are going to add a configuration option like this I would like to see the configuration option read and reacted in the "configure_cassandra" function of the hooks/cassandra-common file.

You can keep the code in the "install" function but need to add it to something that will be called on "config-changed".

Please let me know when you are ready for another review.

Thanks!

review: Needs Fixing

[Matt Bruzek (mbruzek)]

I can confirm that deploying with the following configuration created a precise with cassandra version 2.0.10 installed.

cassandra:
   allow-single-node: True
   cluster-name: midonet
   apt-repo-spec: "deb http://debian.datastax.com/community stable main"
   apt-repo-key: "7E41C00F85BFC1706C4FFFB3350200F2B999A372"
   extra_packages: "openjdk-7-jre-headless dsc20=2.0.10-1"
   package_version: "2.0.10"

+1 LGTM

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2014-10-23 17:35:45 +0000
+++ config.yaml	2015-07-22 15:24:06 +0000
@@ -202,6 +202,11 @@
         default: ""
         description: |
                 Extra packages to install. A space delimited list of packages.
+    package_version:
+        type: string
+        default: ""
+        description: |
+            Force specific version of the cassandra package.
     partitioner:
         default: "org.apache.cassandra.dht.RandomPartitioner"
         type: string

=== modified file 'hooks/cassandra-common'
--- hooks/cassandra-common	2014-07-10 13:30:43 +0000
+++ hooks/cassandra-common	2015-07-22 15:24:06 +0000
@@ -74,11 +74,15 @@
 # Install cassandra source and install packages
 install_cassandra () {
   juju-log "Installing Cassandra"
+  # Make sure that the hostname loopback resolution is set
+  grep "$(hostname)" /etc/hosts > /dev/null || echo "127.0.1.1 $(cat /etc/hostname)" >> /etc/hosts
+
   # Install the repository
   APT_REPO_SPEC="$(config-get apt-repo-spec)"
   APT_REPO_KEY=$(config-get apt-repo-key)
   # Check for configured extra packages to install from config
   EXTRA_PACKAGES="$(config-get extra_packages)"
+  PACKAGE_VERSION="$(config-get package_version)"
   # Get the debian package in the files directory.
   DEBIAN_PACKAGE_FILE=($CHARM_DIR/files/cassandra_*.deb)
   # Does the debain cassandra package exist in the charm directory?
@@ -103,8 +107,14 @@
     apt-get update
     # Ensure that cassandra does not startup before we have configured it
     disable_cassandra_start
+
     # Install the package
-    DEBIAN_FRONTEND=noninteractive apt-get -qq install -y cassandra python-cheetah dnsutils bzr ${EXTRA_PACKAGES}
+    if [[ "$PACKAGE_VERSION" != "" ]]; then
+        DEBIAN_FRONTEND=noninteractive apt-get -qq install -y cassandra=${PACKAGE_VERSION} python-cheetah dnsutils bzr ${EXTRA_PACKAGES}
+        DEBIAN_FRONTEND=noninteractive apt-mark -qq hold dsc20 cassandra
+    else
+        DEBIAN_FRONTEND=noninteractive apt-get -qq install -y cassandra python-cheetah dnsutils bzr ${EXTRA_PACKAGES}
+    fi
   fi
   bzr_ci || :
 }
@@ -663,6 +673,12 @@
     ;;
   config-changed)
     needs_restart=
+    CASSANDRA_VERSION=`dpkg -s cassandra | grep Version | cut -f2 -d' '`
+    PACKAGE_VERSION="$(config-get package_version)"
+    if [[ "$PACKAGE_VERSION" != "" && "$PACKAGE_VERSION" != "$CASSANDRA_VERSION" ]]; then
+        DEBIAN_FRONTEND=noninteractive apt-get -qq remove cassandra
+        install_cassandra
+    fi
     # Update the cassandra environment with the appropriate JMX port
     configure_jmx_port 
     bzr_ci && needs_restart=: