Merge lp:~johnsca/charms/bundles/mediawiki-scalable/use-trusty-charms into lp:~charmers/charms/bundles/mediawiki-scalable/bundle

[Cory Johns]

Update charms to trusty and apply other fixes from MP#271876 (https://code.launchpad.net/~tvansteenburgh/charms/bundles/mediawiki/use-trusty-charms/+merge/271876) to resolve deploy errors

[Tim Van Steenburgh (tvansteenburgh)]

review: Approve

=== modified file 'bundles.yaml'
--- bundles.yaml	2014-03-03 19:22:05 +0000
+++ bundles.yaml	2015-09-22 17:53:40 +0000
@@ -1,24 +1,25 @@
 mediawiki-scalable: 
-  series: precise
-  services: 
-    mediawiki: 
-      charm: "cs:precise/mediawiki-10"
+  series: trusty
+  services:
+    mediawiki:
+      charm: "cs:trusty/mediawiki-3"
       num_units: 1
-      options: 
+      options:
         debug: false
         name: Please set name of wiki
         skin: vector
-      annotations: 
+      annotations:
         "gui-x": 618
         "gui-y": -128
-    memcached: 
-      charm: "cs:precise/memcached-7"
+    memcached:
+      charm: "cs:trusty/memcached-11"
       num_units: 1
-      options: 
+      options:
+        allow-ufw-ip6-softfail: true
         "connection-limit": 1024
-        "disable-auto-cleanup": "no"
-        "disable-cas": "no"
-        "disable-large-pages": "no"
+        "disable-auto-cleanup": false
+        "disable-cas": false
+        "disable-large-pages": false
         "extra-options": ""
         factor: 1.25
         "min-item-size": -1
@@ -29,13 +30,13 @@
         "tcp-port": 11211
         threads: -1
         "udp-port": 0
-      annotations: 
+      annotations:
         "gui-x": 926
         "gui-y": -125
-    haproxy: 
-      charm: "cs:precise/haproxy-19"
+    haproxy:
+      charm: "cs:trusty/haproxy-13"
       num_units: 1
-      options: 
+      options:
         default_log: global
         default_mode: http
         default_options: "httplog, dontlognull"
@@ -58,13 +59,13 @@
         package_status: install
         services: "- service_name: haproxy_service\n  service_host: \"0.0.0.0\"\n  service_port: 80\n  service_options: [balance leastconn]\n  server_options: maxconn 100\n"
         sysctl: ""
-      annotations: 
+      annotations:
         "gui-x": 619
         "gui-y": -406
-    mysql: 
-      charm: "cs:precise/mysql-28"
+    mysql:
+      charm: "cs:trusty/mysql-28"
       num_units: 1
-      options: 
+      options:
         "binlog-format": MIXED
         "block-size": 5
         "dataset-size": "80%"
@@ -79,13 +80,13 @@
         "tuning-level": safest
         vip_cidr: 24
         vip_iface: eth0
-      annotations: 
+      annotations:
         "gui-x": 926
         "gui-y": 123
-    "mysql-slave": 
-      charm: "cs:precise/mysql-28"
+    "mysql-slave":
+      charm: "cs:trusty/mysql-28"
       num_units: 1
-      options: 
+      options:
         "binlog-format": MIXED
         "block-size": 5
         "dataset-size": "80%"
@@ -100,10 +101,10 @@
         "tuning-level": safest
         vip_cidr: 24
         vip_iface: eth0
-      annotations: 
+      annotations:
         "gui-x": 619
         "gui-y": 124
-  relations: 
+  relations:
     - - "mediawiki:cache"
       - "memcached:cache"
     - - "haproxy:reverseproxy"