Merge lp:~mbruzek/charms/trusty/mellanox/fix-install into lp:~yaell/charms/trusty/mellanox/trunk

[Matt Bruzek]

Yael,

I edited the README to have correct commands and added mkdir to the install hook because of the error I ran into. These changes deployed correctly on our system with a mellanox card. If you agree with these changes please merge these changes with your branch so you are current with what is in the charm store.

Thanks!

=== modified file 'README.md'
--- README.md	2014-12-16 21:35:02 +0000
+++ README.md	2015-01-09 00:49:40 +0000
@@ -6,6 +6,7 @@
 
 Founded in 1999, Mellanox Technologies is headquartered in Sunnyvale, California and Yokneam, Israel.
 
+
 # Usage
 
 Deploy the Mellanox charm from the Juju GUI or the command line:
@@ -20,30 +21,19 @@
 
     juju set mellanox accept-mellanox-license=True
 
-Alternately a configuration YAML file can be passed on deployment. Create a
-YAML file that contains the following content:
-
-    mellanox:
-      accept-mellanox-license:"True"
-
-Then deploy the Mellanox charm with this configuration file:  
-
-    juju deploy mellanox --config mellanox.yaml
-
-If the license is not accepted the Mellanox software will not be installed.
+If the license is not accepted the Mellanox software **will not** be installed.
 
 ## Intel hardware (x86)
 
 The Mellanox charm can be configured to run on x86 hardware.  To run on Intel
-hardware set the`ofed-file` and `md5sum` configuration values appropriately. 
-Go to "Downloads" section on the 
-[Mellanox product webpage](http://www.mellanox.com/page/products_dyn?product_family=26) 
+hardware set the`ofed-file` and `md5sum` configuration values appropriately.
+Go to "Downloads" section on the
+[Mellanox product webpage](http://www.mellanox.com/page/products_dyn?product_family=26)
 to find the version and architecture of software that you wish to install.
 For example:
 
-    juju set ofed-file=MLNX_OFED_LINUX-2.3-2.0.0-ubuntu14.04-x86_64.tgz
-    juju set md5sum=0985c1a6d991b1169e32bebe2c146980
-
+    juju set mellanox ofed-file=MLNX_OFED_LINUX-2.3-2.0.0-ubuntu14.04-x86_64.tgz
+    juju set mellanox md5sum=0985c1a6d991b1169e32bebe2c146980
 
 ## Power hardware (ppc)
 
@@ -51,12 +41,26 @@
 To change the version of popc64le Mellanox software installed you must change
 the `ofed-file` and the `md5sum` configuration options:  
 
-    juju set ofed-file=MLNX_OFED_LINUX-(version)-ubuntu14.04-ppc64le.tgz
-    juju set md5sum=(md5sum of the version)
-
-Go to "Downloads" section on the 
-[Mellanox product webpage](http://www.mellanox.com/page/products_dyn?product_family=26) 
-select the version and Ubuntu 14.04 to find the md5sum of each file.  
+    juju set mellanox ofed-file=MLNX_OFE enteredD_LINUX-(version)-ubuntu14.04-ppc64le.tgz
+    juju set mellanox md5sum=(md5sum of the version)
+
+Go to "Downloads" section on the
+[Mellanox product webpage](http://www.mellanox.com/page/products_dyn?product_family=26)
+select the version and Ubuntu 14.04 to find the md5sum of each file.
+
+### Deploy using a configuration file
+
+Alternately a configuration YAML file can be passed on deployment. Create a
+YAML file that contains the following content:  
+
+    mellanox:
+      accept-mellanox-license: True
+      ofed-file: "MLNX_OFED_LINUX-2.3-2.0.0-ubuntu14.04-x86_64.tgz"
+      md5sum: "0985c1a6d991b1169e32bebe2c146980"
+
+Then deploy the Mellanox charm with this configuration file:  
+
+    juju deploy mellanox --config mellanox_x86.yaml
 
 ## Relate the Mellanox charm to a container charm
 
@@ -73,7 +77,7 @@
 
 The Mellanox software requires a Mellanox Ethernet adapter to fully operate.
 
-Per server the configuration can change and additional tuning is required if 
+Per server the configuration can change and additional tuning is required if
 you can not get the full line performance measurements (e.g. ~40GbE).  
 
 # Contact Information

=== modified file 'hooks/install'
--- hooks/install	2014-12-16 15:17:33 +0000
+++ hooks/install	2015-01-09 00:49:40 +0000
@@ -17,6 +17,10 @@
   if [ ! -f /usr/src/linux-headers-${KERNEL_RELEASE}/arch/powerpc/lib/crtsavres.o  ]; then
     if [ ! -f /usr/src/linux-source-*.tar.bz2 ]; then
       apt-get install -y linux-source
+      if [ -d ${PACKAGE_DIRECTORY} ]; then
+        rm -rf ${PACKAGE_DIRECTORY}
+      fi
+      mkdir -p ${PACKAGE_DIRECTORY}
       tar jxf /usr/src/linux-source-*.tar.bz2 -C ${PACKAGE_DIRECTORY}
       cd ${PACKAGE_DIRECTORY}/linux-source-*
       cp /boot/config-${KERNEL_RELEASE} ./.config