← Back to branch summary

~charmers/charms/bundles/mediawiki-scalable/bundle

« back to all changes in this revision

Viewing changes to bundles.yaml

  • Committer: Tim Van Steenburgh
  • Date: 2015-09-22 18:53:56 UTC
  • mfrom: (8.1.1 mediawiki-scalable)
  • Revision ID: tim.van.steenburgh@canonical.com-20150922185356-oqi684wc4i9mdn3f
[johnsca] Update charms to trusty and apply other fixes from MP#271876 to resolve deploy errors

Show diffs side-by-side

added added

removed removed

Lines of Context:
bundles.yaml
1
1
mediawiki-scalable: 
2
 
  series: precise
3
 
  services: 
4
 
    mediawiki: 
5
 
      charm: "cs:precise/mediawiki-10"
 
2
  series: trusty
 
3
  services:
 
4
    mediawiki:
 
5
      charm: "cs:trusty/mediawiki-3"
6
6
      num_units: 1
7
 
      options: 
 
7
      options:
8
8
        debug: false
9
9
        name: Please set name of wiki
10
10
        skin: vector
11
 
      annotations: 
 
11
      annotations:
12
12
        "gui-x": 618
13
13
        "gui-y": -128
14
 
    memcached: 
15
 
      charm: "cs:precise/memcached-7"
 
14
    memcached:
 
15
      charm: "cs:trusty/memcached-11"
16
16
      num_units: 1
17
 
      options: 
 
17
      options:
 
18
        allow-ufw-ip6-softfail: true
18
19
        "connection-limit": 1024
19
 
        "disable-auto-cleanup": "no"
20
 
        "disable-cas": "no"
21
 
        "disable-large-pages": "no"
 
20
        "disable-auto-cleanup": false
 
21
        "disable-cas": false
 
22
        "disable-large-pages": false
22
23
        "extra-options": ""
23
24
        factor: 1.25
24
25
        "min-item-size": -1
29
30
        "tcp-port": 11211
30
31
        threads: -1
31
32
        "udp-port": 0
32
 
      annotations: 
 
33
      annotations:
33
34
        "gui-x": 926
34
35
        "gui-y": -125
35
 
    haproxy: 
36
 
      charm: "cs:precise/haproxy-19"
 
36
    haproxy:
 
37
      charm: "cs:trusty/haproxy-13"
37
38
      num_units: 1
38
 
      options: 
 
39
      options:
39
40
        default_log: global
40
41
        default_mode: http
41
42
        default_options: "httplog, dontlognull"
58
59
        package_status: install
59
60
        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"
60
61
        sysctl: ""
61
 
      annotations: 
 
62
      annotations:
62
63
        "gui-x": 619
63
64
        "gui-y": -406
64
 
    mysql: 
65
 
      charm: "cs:precise/mysql-28"
 
65
    mysql:
 
66
      charm: "cs:trusty/mysql-28"
66
67
      num_units: 1
67
 
      options: 
 
68
      options:
68
69
        "binlog-format": MIXED
69
70
        "block-size": 5
70
71
        "dataset-size": "80%"
79
80
        "tuning-level": safest
80
81
        vip_cidr: 24
81
82
        vip_iface: eth0
82
 
      annotations: 
 
83
      annotations:
83
84
        "gui-x": 926
84
85
        "gui-y": 123
85
 
    "mysql-slave": 
86
 
      charm: "cs:precise/mysql-28"
 
86
    "mysql-slave":
 
87
      charm: "cs:trusty/mysql-28"
87
88
      num_units: 1
88
 
      options: 
 
89
      options:
89
90
        "binlog-format": MIXED
90
91
        "block-size": 5
91
92
        "dataset-size": "80%"
100
101
        "tuning-level": safest
101
102
        vip_cidr: 24
102
103
        vip_iface: eth0
103
 
      annotations: 
 
104
      annotations:
104
105
        "gui-x": 619
105
106
        "gui-y": 124
106
 
  relations: 
 
107
  relations:
107
108
    - - "mediawiki:cache"
108
109
      - "memcached:cache"
109
110
    - - "haproxy:reverseproxy"