Merge branch 'master' into pr/24

galera/meta/heka.yml

@@ -9,7 +9,7 @@ log_collector:
     galera:
       engine: logstreamer
       log_directory: "/var/log"
-      file_match: 'mysql/error.log$'
+      file_match: 'mysql/error\.log$'
       differentiator: ["galera"]
       decoder: "galera_decoder"
       splitter: "galera_splitter"

galera/server.sls

@@ -37,6 +37,7 @@ mysql_grants_{{ user.name }}_{{ database_name }}_{{ user.host }}:
   - template: jinja
   - defaults:
     database_name: {{ database_name }}
+    database: {{ database }}
   - require: 
     - file: mysql_dirs
     - mysql_database: mysql_database_{{ database_name }}

tests/pillar/repo_galeracluster.sls

@@ -6,7 +6,6 @@ linux:
         source: 'deb http://releases.galeracluster.com/ubuntu {{ grains.get('oscodename') }} main'
         key_id: BC19DDBA
         key_server: hkp://p80.pool.sks-keyservers.net:80
-      mirantis_openstack_repo:
-        source: "deb http://mirror.fuel-infra.org/mcp-repos/1.0/{{ grains.get('oscodename') }} mitaka main"
-        architectures: amd64
-        key_url: "http://mirror.fuel-infra.org/mcp-repos/1.0/{{ grains.get('oscodename') }}/archive-mcp1.0.key"
+      mitaka-staging_PPA:
+        source: "deb http://ppa.launchpad.net/ubuntu-cloud-archive/mitaka-staging/ubuntu trusty main"
+