Merge lp:~1chb1n/openstack-charm-testing/liberty-prep into lp:openstack-charm-testing

[Ryan Beisner]

N-G to Q-G rename in next bundles; Prep for wily/liberty; Switch to pxc.

N-G to Q-G rename in next bundles; Prep for wily/liberty; Switch to pxc.

[lp:~1chb1n/openstack-charm-testing/liberty-prep]

110. By Ryan Beisner on 2015-07-21

update

111. By Ryan Beisner on 2015-07-21

rebase, resolve conflicts

[James Page (james-page)]

review: Approve

=== modified file 'bundles/0mq/0mq.yaml'
--- bundles/0mq/0mq.yaml	2015-07-17 16:31:58 +0000
+++ bundles/0mq/0mq.yaml	2015-07-21 13:28:25 +0000
@@ -2,7 +2,7 @@
 openstack-services:
   services:
     mysql:
-      branch: lp:charms/mysql
+      branch: lp:~openstack-charmers/charms/trusty/percona-cluster/next
       constraints: mem=1G
       options:
         dataset-size: 50%
@@ -144,3 +144,29 @@
 vivid-kilo-zmq:
   inherits: openstack-icehouse-zmq
   series: vivid
+# liberty
+trusty-liberty:
+  inherits: openstack-icehouse
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-liberty
+    source: cloud:trusty-liberty
+trusty-liberty-proposed:
+  inherits: trusty-liberty
+  overrides:
+    openstack-origin: cloud:trusty-liberty/proposed
+    source: cloud:trusty-liberty/proposed
+trusty-liberty-staging:
+  inherits: trusty-liberty
+  overrides:
+    openstack-origin: ppa:ubuntu-cloud-archive/liberty-staging
+    source: ppa:ubuntu-cloud-archive/liberty-staging
+wily-liberty:
+  inherits: openstack-icehouse
+  series: wily
+wily-liberty-proposed:
+  inherits: wily-liberty
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed
+

=== modified file 'bundles/baremetal/7-default.yaml'
--- bundles/baremetal/7-default.yaml	2015-04-02 03:52:38 +0000
+++ bundles/baremetal/7-default.yaml	2015-07-21 13:28:25 +0000
@@ -9,7 +9,7 @@
 openstack-services:
   services:
     mysql:
-      branch: lp:charms/trusty/mysql
+      branch: lp:charms/trusty/percona-cluster
       options:
         dataset-size: 50%
         max-connections: 20000
@@ -312,3 +312,28 @@
   overrides:
     source: proposed
     openstack-origin: distro-proposed
+# liberty
+trusty-liberty:
+  inherits: openstack-icehouse
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-liberty
+    source: cloud:trusty-liberty
+trusty-liberty-proposed:
+  inherits: trusty-liberty
+  overrides:
+    openstack-origin: cloud:trusty-liberty/proposed
+    source: cloud:trusty-liberty/proposed
+trusty-liberty-staging:
+  inherits: trusty-liberty
+  overrides:
+    openstack-origin: ppa:ubuntu-cloud-archive/liberty-staging
+    source: ppa:ubuntu-cloud-archive/liberty-staging
+wily-liberty:
+  inherits: openstack-icehouse
+  series: wily
+wily-liberty-proposed:
+  inherits: wily-liberty
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed

=== modified file 'bundles/baremetal/7-next.yaml'
--- bundles/baremetal/7-next.yaml	2015-07-17 16:31:58 +0000
+++ bundles/baremetal/7-next.yaml	2015-07-21 13:28:25 +0000
@@ -9,7 +9,7 @@
 openstack-services:
   services:
     mysql:
-      branch: lp:charms/trusty/mysql
+      branch: lp:~openstack-charmers/charms/trusty/percona-cluster/next
       options:
         dataset-size: 50%
         max-connections: 20000
@@ -206,7 +206,6 @@
   services:
     neutron-api:
       branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
-#      constraints: mem=1G
       options:
         neutron-security-groups: True
     neutron-openvswitch:
@@ -313,3 +312,28 @@
   overrides:
     source: proposed
     openstack-origin: distro-proposed
+# liberty
+trusty-liberty:
+  inherits: openstack-icehouse
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-liberty
+    source: cloud:trusty-liberty
+trusty-liberty-proposed:
+  inherits: trusty-liberty
+  overrides:
+    openstack-origin: cloud:trusty-liberty/proposed
+    source: cloud:trusty-liberty/proposed
+trusty-liberty-staging:
+  inherits: trusty-liberty
+  overrides:
+    openstack-origin: ppa:ubuntu-cloud-archive/liberty-staging
+    source: ppa:ubuntu-cloud-archive/liberty-staging
+wily-liberty:
+  inherits: openstack-icehouse
+  series: wily
+wily-liberty-proposed:
+  inherits: wily-liberty
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed

=== modified file 'bundles/dev/nc-lxd-3host.yaml'
--- bundles/dev/nc-lxd-3host.yaml	2015-07-17 16:31:58 +0000
+++ bundles/dev/nc-lxd-3host.yaml	2015-07-21 13:28:25 +0000
@@ -60,7 +60,7 @@
         "gui-x": "250"
         "gui-y": "500"
     mysql:
-      branch: lp:charms/trusty/mysql
+      branch: lp:~openstack-charmers/charms/trusty/percona-cluster/next
       num_units: 1
       options:
         "max-connections": 20000

=== modified file 'bundles/dev/next-ha.yaml'
--- bundles/dev/next-ha.yaml	2015-07-17 16:31:58 +0000
+++ bundles/dev/next-ha.yaml	2015-07-21 13:28:25 +0000
@@ -5,7 +5,7 @@
     mysql:
       num_units: 2
       charm: percona-cluster
-      branch: lp:~openstack-charmers/charms/trusty/percona-cluster/trunk
+      branch: lp:~openstack-charmers/charms/trusty/percona-cluster/next
       constraints: mem=1G
       options:
         dataset-size: 50%
@@ -326,3 +326,54 @@
   overrides:
     source: proposed
     openstack-origin: distro-proposed
+# kilo
+trusty-kilo:
+  inherits: openstack-icehouse
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-kilo
+    source: cloud:trusty-kilo
+trusty-kilo-proposed:
+  inherits: trusty-kilo
+  overrides:
+    openstack-origin: cloud:trusty-kilo/proposed
+    source: cloud:trusty-kilo/proposed
+trusty-kilo-staging:
+  inherits: trusty-kilo
+  overrides:
+    openstack-origin: ppa:ubuntu-cloud-archive/kilo-staging
+    source: ppa:ubuntu-cloud-archive/kilo-staging
+vivid-kilo:
+  inherits: openstack-icehouse
+  series: vivid
+vivid-kilo-proposed:
+  inherits: vivid-kilo
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed
+# liberty
+trusty-liberty:
+  inherits: openstack-icehouse
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-liberty
+    source: cloud:trusty-liberty
+trusty-liberty-proposed:
+  inherits: trusty-liberty
+  overrides:
+    openstack-origin: cloud:trusty-liberty/proposed
+    source: cloud:trusty-liberty/proposed
+trusty-liberty-staging:
+  inherits: trusty-liberty
+  overrides:
+    openstack-origin: ppa:ubuntu-cloud-archive/liberty-staging
+    source: ppa:ubuntu-cloud-archive/liberty-staging
+wily-liberty:
+  inherits: openstack-icehouse
+  series: wily
+wily-liberty-proposed:
+  inherits: wily-liberty
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed
+

=== removed file 'bundles/dev/next-kilo-testing.yaml'
--- bundles/dev/next-kilo-testing.yaml	2015-07-17 16:31:58 +0000
+++ bundles/dev/next-kilo-testing.yaml	1970-01-01 00:00:00 +0000
@@ -1,278 +0,0 @@
-# vim: set ts=2 et:
-#
-# temporary bundle to exercise the kilo-support branches
-#
-# deployer bundle for development ('next') charms
-openstack-services:
-  services:
-    mysql:
-#      branch: lp:charms/trusty/mysql
-      branch: lp:~gnuoy/charms/trusty/mysql/sync-ch
-      constraints: mem=1G
-      options:
-        dataset-size: 50%
-    rabbitmq-server:
-      branch: lp:~openstack-charmers/charms/trusty/rabbitmq-server/next
-      constraints: mem=1G
-    ceph:
-      branch: lp:~openstack-charmers/charms/trusty/ceph/next
-      num_units: 3
-      constraints: mem=1G
-      options:
-        monitor-count: 3
-        fsid: 6547bd3e-1397-11e2-82e5-53567c8d32dc
-        monitor-secret: AQCXrnZQwI7KGBAAiPofmKEXKxu5bUzoYLVkbQ==
-        osd-devices: /dev/vdb
-        osd-reformat: "yes"
-        ephemeral-unmount: /mnt
-    keystone:
-      branch: lp:~openstack-charmers/charms/trusty/keystone/next
-      constraints: mem=1G
-      options:
-        admin-password: openstack
-        admin-token: ubuntutesting
-    openstack-dashboard:
-      branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
-      constraints: mem=1G
-    nova-compute:
-      branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
-      num_units: 3
-      constraints: mem=4G
-      options:
-        enable-live-migration: True
-        enable-resize: True
-    nova-cloud-controller:
-      branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
-      constraints: mem=1G
-      options:
-        network-manager: Quantum
-        quantum-security-groups: "yes"
-    neutron-gateway:
-      branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next
-      constraints: mem=1G
-      options:
-        instance-mtu: 1300
-    cinder:
-      branch: lp:~openstack-charmers/charms/trusty/cinder/next
-      options:
-        block-device: "None"
-        glance-api-version: 2
-      constraints: mem=1G
-    cinder-ceph:
-      branch: lp:~openstack-charmers/charms/trusty/cinder-ceph/next
-    glance:
-      branch: lp:~openstack-charmers/charms/trusty/glance/next
-      constraints: mem=1G
-    swift-proxy:
-      branch: lp:~openstack-charmers/charms/trusty/swift-proxy/next
-      constraints: mem=1G
-      options:
-        zone-assignment: manual
-        replicas: 3
-        swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
-    swift-storage-z1:
-      branch: lp:~openstack-charmers/charms/trusty/swift-storage/next
-      constraints: mem=1G
-      options:
-        zone: 1
-        block-device: vdb
-        overwrite: "true"
-    swift-storage-z2:
-      branch: lp:~openstack-charmers/charms/trusty/swift-storage/next
-      constraints: mem=1G
-      options:
-        zone: 2
-        block-device: vdb
-        overwrite: "true"
-    swift-storage-z3:
-      branch: lp:~openstack-charmers/charms/trusty/swift-storage/next
-      constraints: mem=1G
-      options:
-        zone: 3
-        block-device: vdb
-        overwrite: "true"
-    ceilometer:
-      branch: lp:~openstack-charmers/charms/trusty/ceilometer/next
-      constraints: mem=1G
-    ceilometer-agent:
-      branch: lp:~openstack-charmers/charms/trusty/ceilometer-agent/next
-    heat:
-      branch: lp:~openstack-charmers/charms/trusty/heat/next
-    mongodb:
-#      branch: lp:charms/trusty/mongodb
-      branch: lp:~gnuoy/charms/trusty/mongodb/sync-ch
-      constraints: mem=1G
-  relations:
-    - [ keystone, mysql ]
-    - [ nova-cloud-controller, mysql ]
-    - [ nova-cloud-controller, rabbitmq-server ]
-    - [ nova-cloud-controller, glance ]
-    - [ nova-cloud-controller, keystone ]
-    - [ nova-compute, nova-cloud-controller ]
-    - [ nova-compute, mysql ]
-    - - nova-compute
-      - rabbitmq-server:amqp
-    - [ nova-compute, glance ]
-    - [ nova-compute, ceph ]
-    - [ glance, mysql ]
-    - [ glance, keystone ]
-    - [ glance, ceph ]
-    - [ glance, cinder ]
-    - [ cinder, mysql ]
-    - [ cinder, rabbitmq-server ]
-    - [ cinder, nova-cloud-controller ]
-    - [ cinder, keystone ]
-    - [ cinder, cinder-ceph ]
-    - [ cinder-ceph, ceph ]
-    - [ neutron-gateway, mysql ]
-    - [ neutron-gateway, nova-cloud-controller ]
-    - [ openstack-dashboard, keystone ]
-    - [ swift-proxy, keystone ]
-    - [ swift-proxy, swift-storage-z1 ]
-    - [ swift-proxy, swift-storage-z2 ]
-    - [ swift-proxy, swift-storage-z3 ]
-    - - ceilometer
-      - keystone:identity-service
-    - [ ceilometer, rabbitmq-server ]
-    - [ ceilometer, mongodb ]
-    - [ ceilometer-agent, nova-compute ]
-    - [ ceilometer-agent, ceilometer ]
-    - [ heat, mysql ]
-    - [ heat, keystone ]
-    - [ heat, rabbitmq-server ]
-openstack-singlerabbit:
-  inherits: openstack-services
-  relations:
-    - [ "neutron-gateway:amqp", rabbitmq-server ]
-openstack-icehouse:
-  inherits: openstack-singlerabbit
-  services:
-    neutron-api:
-      branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
-      constraints: mem=1G
-      options:
-        neutron-security-groups: True
-    neutron-openvswitch:
-      branch: lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next
-  relations:
-  - [ neutron-api, mysql ]
-  - [ neutron-api, rabbitmq-server ]
-  - [ neutron-api, nova-cloud-controller ]
-  - [ neutron-api, neutron-openvswitch ]
-  - [ neutron-api, keystone ]
-  - [ neutron-api, neutron-gateway ]
-  - [ neutron-openvswitch, nova-compute ]
-  - [ neutron-openvswitch, rabbitmq-server ]
-openstack-icehouse-msg-split:
-  inherits: openstack-services
-  services:
-    neutron-api:
-      branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
-      constraints: mem=1G
-      options:
-        neutron-security-groups: True
-    neutron-openvswitch:
-      branch: lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next
-    rabbitmq-server-neutron:
-      branch: lp:charms/trusty/rabbitmq-server
-      constraints: mem=1G
-  relations:
-  - [ neutron-api, mysql ]
-  - [ neutron-api, rabbitmq-server-neutron ]
-  - [ neutron-api, nova-cloud-controller ]
-  - [ neutron-api, neutron-openvswitch ]
-  - [ neutron-api, keystone ]
-  - [ neutron-api, neutron-gateway ]
-  - [ neutron-openvswitch, nova-compute ]
-  - [ neutron-openvswitch, rabbitmq-server-neutron ]
-  - [ "neutron-gateway:amqp-nova", rabbitmq-server ]
-  - [ "neutron-gateway:amqp", rabbitmq-server-neutron ]
-# icehouse
-precise-icehouse:
-  inherits: openstack-singlerabbit
-  series: precise
-  overrides:
-    openstack-origin: cloud:precise-icehouse
-    source: cloud:precise-icehouse
-precise-icehouse-proposed:
-  inherits: precise-icehouse
-  overrides:
-    openstack-origin: cloud:precise-icehouse/proposed
-    source: cloud:precise-updates/icehouse
-precise-icehouse-staging:
-  inherits: precise-icehouse
-  overrides:
-    openstack-origin: ppa:ubuntu-cloud-archive/icehouse-staging
-    source: ppa:ubuntu-cloud-archive/icehouse-staging
-precise-icehouse-trunk:
-  inherits: precise-icehouse
-  overrides:
-    openstack-origin: ppa:openstack-ubuntu-testing/icehouse
-    source: ppa:openstack-ubuntu-testing/icehouse
-trusty-icehouse:
-  inherits: openstack-icehouse
-  series: trusty
-trusty-icehouse-msg-split:
-  inherits: openstack-icehouse-msg-split
-  series: trusty
-trusty-icehouse-proposed:
-  inherits: trusty-icehouse
-  overrides:
-    source: proposed
-    openstack-origin: distro-proposed
-trusty-icehouse-trunk:
-  inherits: trusty-icehouse
-  overrides:
-    openstack-origin: ppa:openstack-ubuntu-testing/icehouse
-    source: ppa:openstack-ubuntu-testing/icehouse
-    offline-compression: "no"
-# juno
-trusty-juno:
-  inherits: openstack-icehouse
-  series: trusty
-  overrides:
-    openstack-origin: cloud:trusty-juno
-    source: cloud:trusty-juno
-trusty-juno-proposed:
-  inherits: trusty-juno
-  overrides:
-    openstack-origin: cloud:trusty-juno/proposed
-    source: cloud:trusty-proposed/juno
-trusty-juno-staging:
-  inherits: trusty-juno
-  overrides:
-    openstack-origin: ppa:ubuntu-cloud-archive/juno-staging
-    source: ppa:ubuntu-cloud-archive/juno-staging
-utopic-juno:
-  inherits: openstack-icehouse
-  series: utopic
-utopic-juno-proposed:
-  inherits: utopic-juno
-  overrides:
-    source: proposed
-    openstack-origin: distro-proposed
-# kilo
-trusty-kilo:
-  inherits: openstack-icehouse
-  series: trusty
-  overrides:
-    openstack-origin: cloud:trusty-kilo
-    source: cloud:trusty-kilo
-trusty-kilo-proposed:
-  inherits: trusty-kilo
-  overrides:
-    openstack-origin: cloud:trusty-kilo/proposed
-    source: cloud:trusty-proposed/kilo
-trusty-kilo-staging:
-  inherits: trusty-kilo
-  overrides:
-    openstack-origin: ppa:ubuntu-cloud-archive/kilo-staging
-    source: ppa:ubuntu-cloud-archive/kilo-staging
-vivid-kilo:
-  inherits: openstack-icehouse
-  series: vivid
-vivid-kilo-proposed:
-  inherits: vivid-kilo
-  overrides:
-    source: proposed
-    openstack-origin: distro-proposed

=== modified file 'bundles/dev/two-smoosh.yaml'
--- bundles/dev/two-smoosh.yaml	2015-07-17 16:31:58 +0000
+++ bundles/dev/two-smoosh.yaml	2015-07-21 13:28:25 +0000
@@ -36,7 +36,6 @@
         - "lxc:0"
     neutron-gateway:
       branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next
-#      constraints: mem=8G
       num_units: 1
       options:
         "ext-port": eth1
@@ -64,7 +63,7 @@
         "gui-x": "250"
         "gui-y": "500"
     mysql:
-      branch: lp:charms/trusty/mysql
+      branch: lp:~openstack-charmers/charms/trusty/percona-cluster/next
       num_units: 1
       options:
         "max-connections": 20000

=== modified file 'bundles/leadership-election/leadership-election.yaml'
--- bundles/leadership-election/leadership-election.yaml	2015-06-09 10:05:05 +0000
+++ bundles/leadership-election/leadership-election.yaml	2015-07-21 13:28:25 +0000
@@ -474,3 +474,29 @@
   overrides:
     source: proposed
     openstack-origin: distro-proposed
+# liberty
+trusty-liberty:
+  inherits: openstack-icehouse
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-liberty
+    source: cloud:trusty-liberty
+trusty-liberty-proposed:
+  inherits: trusty-liberty
+  overrides:
+    openstack-origin: cloud:trusty-liberty/proposed
+    source: cloud:trusty-liberty/proposed
+trusty-liberty-staging:
+  inherits: trusty-liberty
+  overrides:
+    openstack-origin: ppa:ubuntu-cloud-archive/liberty-staging
+    source: ppa:ubuntu-cloud-archive/liberty-staging
+wily-liberty:
+  inherits: openstack-icehouse
+  series: wily
+wily-liberty-proposed:
+  inherits: wily-liberty
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed
+

=== modified file 'bundles/legacy/essex.yaml'
--- bundles/legacy/essex.yaml	2015-02-20 21:27:00 +0000
+++ bundles/legacy/essex.yaml	2015-07-21 13:28:25 +0000
@@ -1,5 +1,7 @@
 # precise-essex next
 #
+# /!\ Not functionally validated /!\
+#
 # NOTE(beisner) 2015 Feb 18: This is a bundle to deploy precise-essex for
 # testing purposes, using the current development ('next') charms.  It is
 # not intended for production deployment use.

=== modified file 'bundles/other/deployer-quick-check.yaml'
--- bundles/other/deployer-quick-check.yaml	2015-02-25 14:27:26 +0000
+++ bundles/other/deployer-quick-check.yaml	2015-07-21 13:28:25 +0000
@@ -4,7 +4,7 @@
 deployer-quick-check:
   services:
     mysql:
-      branch: lp:charms/trusty/mysql
+      branch: lp:~openstack-charmers/charms/trusty/percona-cluster/next
       constraints: mem=1G
       options:
         dataset-size: 50%
@@ -102,3 +102,29 @@
   overrides:
     source: proposed
     openstack-origin: distro-proposed
+# liberty
+trusty-liberty:
+  inherits: openstack-icehouse
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-liberty
+    source: cloud:trusty-liberty
+trusty-liberty-proposed:
+  inherits: trusty-liberty
+  overrides:
+    openstack-origin: cloud:trusty-liberty/proposed
+    source: cloud:trusty-liberty/proposed
+trusty-liberty-staging:
+  inherits: trusty-liberty
+  overrides:
+    openstack-origin: ppa:ubuntu-cloud-archive/liberty-staging
+    source: ppa:ubuntu-cloud-archive/liberty-staging
+wily-liberty:
+  inherits: openstack-icehouse
+  series: wily
+wily-liberty-proposed:
+  inherits: wily-liberty
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed
+

=== modified file 'bundles/other/mediawikijoompress.yaml'
--- bundles/other/mediawikijoompress.yaml	2015-03-02 17:10:49 +0000
+++ bundles/other/mediawikijoompress.yaml	2015-07-21 13:28:25 +0000
@@ -50,3 +50,6 @@
 vivid:
   inherits: mediawikijoompress
   series: vivid
+wily:
+  inherits: mediawikijoompress
+  series: wily

=== modified file 'bundles/other/ubuntu3-dev.yaml'
--- bundles/other/ubuntu3-dev.yaml	2015-04-28 12:06:33 +0000
+++ bundles/other/ubuntu3-dev.yaml	2015-07-21 13:28:25 +0000
@@ -30,3 +30,6 @@
 vivid:
   inherits: u3
   series: vivid
+wily:
+  inherits: u3
+  series: wily

=== modified file 'bundles/other/ubuntu3-lxc.yaml'
--- bundles/other/ubuntu3-lxc.yaml	2015-03-05 01:19:57 +0000
+++ bundles/other/ubuntu3-lxc.yaml	2015-07-21 13:28:25 +0000
@@ -33,3 +33,6 @@
 vivid:
   inherits: u3lxc
   series: vivid
+wily:
+  inherits: u3lxc
+  series: wily

=== modified file 'bundles/other/ubuntu3.yaml'
--- bundles/other/ubuntu3.yaml	2015-03-02 17:10:49 +0000
+++ bundles/other/ubuntu3.yaml	2015-07-21 13:28:25 +0000
@@ -25,3 +25,6 @@
 vivid:
   inherits: u3
   series: vivid
+wily:
+  inherits: u3
+  series: wily

=== modified file 'bundles/ppc64/powerkvm-fullstack.yaml'
--- bundles/ppc64/powerkvm-fullstack.yaml	2015-07-08 15:41:50 +0000
+++ bundles/ppc64/powerkvm-fullstack.yaml	2015-07-21 13:28:25 +0000
@@ -55,7 +55,7 @@
 openstack-services:
   services:
     mysql:
-      branch: lp:charms/trusty/mysql
+      branch: lp:charms/trusty/percona-cluster
       options:
         dataset-size: 75%
         max-connections: 20000
@@ -279,3 +279,29 @@
   overrides:
     source: proposed
     openstack-origin: distro-proposed
+# liberty
+trusty-liberty:
+  inherits: openstack-icehouse
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-liberty
+    source: cloud:trusty-liberty
+trusty-liberty-proposed:
+  inherits: trusty-liberty
+  overrides:
+    openstack-origin: cloud:trusty-liberty/proposed
+    source: cloud:trusty-liberty/proposed
+trusty-liberty-staging:
+  inherits: trusty-liberty
+  overrides:
+    openstack-origin: ppa:ubuntu-cloud-archive/liberty-staging
+    source: ppa:ubuntu-cloud-archive/liberty-staging
+wily-liberty:
+  inherits: openstack-icehouse
+  series: wily
+wily-liberty-proposed:
+  inherits: wily-liberty
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed
+

=== modified file 'bundles/ppc64/powerkvm-three-unit-method1.yaml'
--- bundles/ppc64/powerkvm-three-unit-method1.yaml	2015-07-17 16:31:58 +0000
+++ bundles/ppc64/powerkvm-three-unit-method1.yaml	2015-07-21 13:28:25 +0000
@@ -69,7 +69,7 @@
         "gui-x": "250"
         "gui-y": "500"
     mysql:
-      branch: lp:charms/trusty/mysql
+      branch: lp:~openstack-charmers/charms/trusty/percona-cluster/next
       num_units: 1
       options:
         "max-connections": 20000

=== modified file 'bundles/ppc64/powerkvm-two-unit-dense.yaml'
--- bundles/ppc64/powerkvm-two-unit-dense.yaml	2015-02-20 22:32:32 +0000
+++ bundles/ppc64/powerkvm-two-unit-dense.yaml	2015-07-21 13:28:25 +0000
@@ -6,7 +6,7 @@
 openstack-services:
   services:
     mysql:
-      branch: lp:charms/trusty/mysql
+      branch: lp:charms/trusty/percona-cluster
       options:
         dataset-size: 75%
       to:
@@ -177,3 +177,29 @@
   overrides:
     source: proposed
     openstack-origin: distro-proposed
+# liberty
+trusty-liberty:
+  inherits: openstack-icehouse
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-liberty
+    source: cloud:trusty-liberty
+trusty-liberty-proposed:
+  inherits: trusty-liberty
+  overrides:
+    openstack-origin: cloud:trusty-liberty/proposed
+    source: cloud:trusty-liberty/proposed
+trusty-liberty-staging:
+  inherits: trusty-liberty
+  overrides:
+    openstack-origin: ppa:ubuntu-cloud-archive/liberty-staging
+    source: ppa:ubuntu-cloud-archive/liberty-staging
+wily-liberty:
+  inherits: openstack-icehouse
+  series: wily
+wily-liberty-proposed:
+  inherits: wily-liberty
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed
+

=== modified file 'bundles/ppc64/ppc64el-two-unit-method1.yaml'
--- bundles/ppc64/ppc64el-two-unit-method1.yaml	2015-07-17 16:31:58 +0000
+++ bundles/ppc64/ppc64el-two-unit-method1.yaml	2015-07-21 13:28:25 +0000
@@ -62,7 +62,7 @@
         "gui-x": "250"
         "gui-y": "500"
     mysql:
-      branch: lp:charms/trusty/mysql
+      branch: lp:~openstack-charmers/charms/trusty/percona-cluster/next
       num_units: 1
       options:
         "max-connections": 20000

=== modified file 'bundles/ppc64/ppc64el-two-unit-method2.yaml'
--- bundles/ppc64/ppc64el-two-unit-method2.yaml	2015-07-17 16:31:58 +0000
+++ bundles/ppc64/ppc64el-two-unit-method2.yaml	2015-07-21 13:28:25 +0000
@@ -66,7 +66,7 @@
         "gui-x": "250"
         "gui-y": "500"
     mysql:
-      branch: lp:charms/trusty/mysql
+      branch: lp:~openstack-charmers/charms/trusty/percona-cluster/next
       num_units: 1
       options:
         "max-connections": 20000

=== modified file 'bundles/source/default.yaml'
--- bundles/source/default.yaml	2015-05-09 14:46:37 +0000
+++ bundles/source/default.yaml	2015-07-21 13:28:25 +0000
@@ -4,7 +4,7 @@
 openstack-services:
   services:
     mysql:
-      branch: lp:charms/trusty/mysql
+      branch: lp:charms/trusty/percona-cluster
       constraints: mem=1G
       options:
         dataset-size: 50%

=== modified file 'bundles/source/next.yaml'
--- bundles/source/next.yaml	2015-05-12 21:08:29 +0000
+++ bundles/source/next.yaml	2015-07-21 13:28:25 +0000
@@ -4,7 +4,7 @@
 openstack-services:
   services:
     mysql:
-      branch: lp:charms/trusty/mysql
+      branch: lp:~openstack-charmers/charms/trusty/percona-cluster/next
       constraints: mem=1G
       options:
         dataset-size: 50%

=== modified file 'bundles/sparse/default.yaml'
--- bundles/sparse/default.yaml	2015-05-08 15:47:48 +0000
+++ bundles/sparse/default.yaml	2015-07-21 13:28:25 +0000
@@ -4,7 +4,7 @@
 openstack-services:
   services:
     mysql:
-      branch: lp:charms/trusty/mysql
+      branch: lp:charms/trusty/percona-cluster
       constraints: mem=1G
       options:
         dataset-size: 50%
@@ -273,3 +273,29 @@
   overrides:
     source: proposed
     openstack-origin: distro-proposed
+# liberty
+trusty-liberty:
+  inherits: openstack-icehouse
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-liberty
+    source: cloud:trusty-liberty
+trusty-liberty-proposed:
+  inherits: trusty-liberty
+  overrides:
+    openstack-origin: cloud:trusty-liberty/proposed
+    source: cloud:trusty-liberty/proposed
+trusty-liberty-staging:
+  inherits: trusty-liberty
+  overrides:
+    openstack-origin: ppa:ubuntu-cloud-archive/liberty-staging
+    source: ppa:ubuntu-cloud-archive/liberty-staging
+wily-liberty:
+  inherits: openstack-icehouse
+  series: wily
+wily-liberty-proposed:
+  inherits: wily-liberty
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed
+

=== modified file 'bundles/sparse/next.yaml'
--- bundles/sparse/next.yaml	2015-07-17 16:31:58 +0000
+++ bundles/sparse/next.yaml	2015-07-21 13:28:25 +0000
@@ -4,7 +4,7 @@
 openstack-services:
   services:
     mysql:
-      branch: lp:charms/trusty/mysql
+      branch: lp:~openstack-charmers/charms/trusty/percona-cluster/next
       constraints: mem=1G
       options:
         dataset-size: 50%
@@ -273,3 +273,29 @@
   overrides:
     source: proposed
     openstack-origin: distro-proposed
+# liberty
+trusty-liberty:
+  inherits: openstack-icehouse
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-liberty
+    source: cloud:trusty-liberty
+trusty-liberty-proposed:
+  inherits: trusty-liberty
+  overrides:
+    openstack-origin: cloud:trusty-liberty/proposed
+    source: cloud:trusty-liberty/proposed
+trusty-liberty-staging:
+  inherits: trusty-liberty
+  overrides:
+    openstack-origin: ppa:ubuntu-cloud-archive/liberty-staging
+    source: ppa:ubuntu-cloud-archive/liberty-staging
+wily-liberty:
+  inherits: openstack-icehouse
+  series: wily
+wily-liberty-proposed:
+  inherits: wily-liberty
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed
+