Merge lp:~kwmonroe/charms/trusty/suitecrm/updates into lp:~joe/charms/trusty/suitecrm/trunk

[Kevin W Monroe]

Proposed changes to address comments from the new charm bug:

https://bugs.launchpad.net/charms/+bug/1479471

[Joe Liau (joe)]

Thank you.

review: Approve

=== modified file 'README.md'
--- README.md	2015-07-29 05:44:12 +0000
+++ README.md	2015-08-17 18:54:42 +0000
@@ -1,38 +1,51 @@
 # Foreward
 
 Based heavily on the SugarCRM charm by Matthew Bruzek and Tim Van Steenburgh
-Source: https://jujucharms.com/u/cabs-team/sugarcrm/trusty/16
+([source](https://jujucharms.com/u/cabs-team/sugarcrm/trusty)).
 
 # Overview
 
 SuiteCRM is an open source alternative to Salesforce, Dynamics and SugarCRM.
 
-This charm will deploy the CRM software and connect it to a running MySQL database. This charm will install the SuiteCRM files in /var/www/html/suitecrm/
+This charm will deploy the CRM software and connect it to a running MySQL
+database. This charm will install the SuiteCRM files in `/var/www/html/suitecrm`.
 
 
 # Installation
 
-To deploy this charm you will need at a minimum: a cloud environment, working Juju installation and a successful bootstrap. Once bootstrapped, deploy the MySQL charm and then this SuiteCRM charm:
+To deploy this charm, you will need at a minimum: a cloud environment, working
+Juju installation, and a successful bootstrap. Once bootstrapped, deploy the
+MySQL charm and then this SuiteCRM charm:
+
     juju deploy mysql
     juju deploy suitecrm
+
 Add a relation between the two of them:
+
     juju add-relation suitecrm:database mysql:db
+
 And finally expose the SuiteCRM service:
+
     juju expose suitecrm
 
 
 # Configuration
 
-Default login
-
-user: Admin
-pass: thisisaTEST!
-
-For SuiteCRM notifications to work add to crontab:
-*    *    *    *    *     cd /var/www/html/suitecrm; php -f cron.php > /dev/null 2>&1
+Default login:
+
+* user: Admin
+* pass: thisisaTEST!
+
+We suggest you change this default password immediately after deployment for
+security purposes.
+
+For SuiteCRM notifications to work, add the following to crontab on each of
+your `suitecrm` units:
+
+    *    *    *    *    *     cd /var/www/html/suitecrm; php -f cron.php > /dev/null 2>&1
+
 
 # Contact Information
-E-mail: Joe Liau <[e-mail]>
-Source: https://github.com/salesagility/SuiteCRM
-
-
+
+* E-mail: Joe Liau <[e-mail]>
+* Source: https://github.com/salesagility/SuiteCRM

=== modified file 'hooks/cache-relation-changed' (properties changed: -x to +x)
=== modified file 'hooks/cache-relation-departed' (properties changed: -x to +x)
=== modified file 'hooks/config-changed' (properties changed: -x to +x)
=== modified file 'hooks/database-relation-broken' (properties changed: -x to +x)
=== modified file 'hooks/database-relation-changed' (properties changed: -x to +x)
--- hooks/database-relation-changed	2015-07-29 03:31:14 +0000
+++ hooks/database-relation-changed	2015-08-17 18:54:42 +0000
@@ -33,20 +33,10 @@
 
 database_file=${CHARM_DIR}/files/suite.sql
 if [ -s ${database_file} ]; then
-  # Grab the number of this unit.
-  number=${JUJU_UNIT_NAME##*/}
-  # Sleep for unit number seconds to avoid two units entering at same time.
-  sleep ${number}
   table_name="juju"
 
-  # Build a query to check if the table exists inside the database.
-  table_query="select count(*) from information_schema.tables where table_schema='${db_name}' and table_name='${table_name}';"
-  # Use the -N to skip column names, and -s to print results tab separated.
-  table_count=`mysql -N -s --user=${db_user} --password=${db_pass} -h ${db_host} ${db_name} -e "${table_query}"`
-  if [ ${table_count} == 0 ]; then
-    create_table="create table ${table_name} (dbloaded int DEFAULT 1) engine InnoDB;"
-
-    mysql --user=${db_user} --password=${db_pass} -h ${db_host} ${db_name} -e "${create_table}"
+  create_table="create table ${table_name} (dbloaded int DEFAULT 1) engine InnoDB;"
+  if mysql --user=${db_user} --password=${db_pass} -h ${db_host} ${db_name} -e "${create_table}"; then
     juju-log "The table ${table_name} did not exist, load the mysql data."
     # Ask MySQL to load the database file.
 

=== modified file 'hooks/install' (properties changed: -x to +x)
=== modified file 'hooks/start' (properties changed: -x to +x)
=== modified file 'hooks/stop' (properties changed: -x to +x)
=== modified file 'hooks/upgrade-charm' (properties changed: -x to +x)
=== modified file 'hooks/website-relation-joined' (properties changed: -x to +x)
=== removed file 'revision'
--- revision	2015-07-29 03:18:18 +0000
+++ revision	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-0
\ No newline at end of file

=== added directory 'tests'
=== added file 'tests/00-setup'
--- tests/00-setup	1970-01-01 00:00:00 +0000
+++ tests/00-setup	2015-08-17 18:54:42 +0000
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+sudo add-apt-repository ppa:juju/stable -y
+sudo apt-get update
+sudo apt-get install amulet python3-requests -y

=== added file 'tests/100-deploy-suitecrm'
--- tests/100-deploy-suitecrm	1970-01-01 00:00:00 +0000
+++ tests/100-deploy-suitecrm	2015-08-17 18:54:42 +0000
@@ -0,0 +1,42 @@
+#!/usr/bin/env python3
+
+import amulet
+import requests
+import unittest
+
+
+class TestDeployment(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        cls.deployment = amulet.Deployment(series='trusty')
+
+        cls.deployment.add('suitecrm', charm='cs:~joe/trusty/suitecrm')
+        cls.deployment.add('mysql', charm='cs:trusty/mysql')
+        cls.deployment.relate('suitecrm:database', 'mysql:db')
+
+        # we know memcached fails on lxc (local provider), so we don't
+        # include that. If you want to test with memcached deployed in your
+        # environment, uncomment the following:
+        # cls.deployment.add('memcached')
+        # cls.deployment.relate('suitecrm:cache', 'memcached:cache')
+
+        cls.deployment.expose('suitecrm')
+
+        try:
+            cls.deployment.setup(timeout=900)
+            cls.deployment.sentry.wait()
+        except amulet.helpers.TimeoutError:
+            amulet.raise_status(amulet.SKIP, msg="Environment wasn't stood up in time")
+        except:
+            raise
+
+    def test_deployment(self):
+        unit = self.deployment.sentry.unit['suitecrm/0']
+
+        # check our suitecrm url
+        page = requests.get('http://%s' % unit.info['public-address'])
+        page.raise_for_status()  # Make sure it's not 5XX error
+
+
+if __name__ == '__main__':
+    unittest.main()

=== added file 'tests/tests.yaml'
--- tests/tests.yaml	1970-01-01 00:00:00 +0000
+++ tests/tests.yaml	2015-08-17 18:54:42 +0000
@@ -0,0 +1,10 @@
+# Driver for bundletester: https://github.com/juju-solutions/bundletester
+#
+# It may be useful to alter the defaults during manual testing. For example,
+# set 'reset: false' to reuse existing charms instead of redeploying them.
+
+# Allow bootstrap of current env, default: true
+bootstrap: true
+
+# Use juju-deployer to reset env between test, default: true
+reset: false