Merge lp:~1chb1n/openstack-charm-testing/pxc-vs-mysql-vs-precise-config-options into lp:openstack-charm-testing

[Ryan Beisner]

Update mysql vs pxc inheritance and drop split-msg in sparse bundles

Precise needs to use the mysql charm which has different charm config options than percona-cluster.

Non-Precise needs to use the percona-cluster charm which has different charm config options than mysql proper.

Also simplify sparse bundles for single amqp only and save split-msg to a new dev bundle for later use if necessary.

Update mysql vs pxc inheritance and drop split-msg in sparse bundles

Precise needs to use the mysql charm which has different charm config options than percona-cluster.

Non-Precise needs to use the percona-cluster charm which has different charm config options than mysql proper.

Also simplify sparse bundles for single amqp only and save split-msg to a new dev bundle for later use if necessary.

The resultant next.yaml looks like:
http://bazaar.launchpad.net/~1chb1n/openstack-charm-testing/pxc-vs-mysql-vs-precise-config-options/view/head:/bundles/sparse/next.yaml

[Ryan Beisner (1chb1n)]

FYI - I've set OSCI to run all of its o-c-t jobs with this branch. Will wait 1 day for those schedules, then report back here.

review: Needs Information

[David Ames (thedac)]

Looks good to me. I love the clean-up of the split message rabbit. Merging shortly.

review: Approve

=== added file 'bundles/dev/next-msg-split.yaml'
--- bundles/dev/next-msg-split.yaml	1970-01-01 00:00:00 +0000
+++ bundles/dev/next-msg-split.yaml	2016-06-09 17:29:17 +0000
@@ -0,0 +1,332 @@
+# Copied to dev bundle to preserve msg splits for future use, as
+# msg split inheritance is removed from the next/defaul sparse
+# bundles to simplify them.
+openstack-services:
+  services:
+    mysql:
+      branch: https://github.com/openstack/charm-percona-cluster
+      constraints: mem=4G
+      options:
+        dataset-size: 50%
+        max-connections: 20000
+        root-password: ChangeMe123
+        sst-password: ChangeMe123
+    rabbitmq-server:
+      branch: https://github.com/openstack/charm-rabbitmq-server
+      constraints: mem=1G
+    ceph:
+      branch: https://github.com/openstack/charm-ceph
+      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: https://github.com/openstack/charm-keystone
+      constraints: mem=1G
+      options:
+        admin-password: openstack
+        admin-token: ubuntutesting
+    openstack-dashboard:
+      branch: https://github.com/openstack/charm-openstack-dashboard
+      constraints: mem=1G
+    nova-compute:
+      branch: https://github.com/openstack/charm-nova-compute
+      num_units: 3
+      constraints: mem=4G
+      options:
+        enable-live-migration: True
+        enable-resize: True
+        migration-auth-type: ssh
+    nova-cloud-controller:
+      branch: https://github.com/openstack/charm-nova-cloud-controller
+      constraints: mem=1G
+      options:
+        network-manager: Neutron
+    neutron-gateway:
+      branch: https://github.com/openstack/charm-neutron-gateway
+      constraints: mem=1G
+      options:
+        instance-mtu: 1300
+    cinder:
+      branch: https://github.com/openstack/charm-cinder
+      options:
+        block-device: "None"
+        glance-api-version: 2
+      constraints: mem=1G
+    cinder-ceph:
+      branch: https://github.com/openstack/charm-cinder-ceph
+    glance:
+      branch: https://github.com/openstack/charm-glance
+      constraints: mem=1G
+    swift-proxy:
+      branch: https://github.com/openstack/charm-swift-proxy
+      constraints: mem=1G
+      options:
+        zone-assignment: manual
+        replicas: 3
+        swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
+    swift-storage-z1:
+      branch: https://github.com/openstack/charm-swift-storage
+      constraints: mem=1G
+      options:
+        zone: 1
+        block-device: vdb
+        overwrite: "true"
+    swift-storage-z2:
+      branch: https://github.com/openstack/charm-swift-storage
+      constraints: mem=1G
+      options:
+        zone: 2
+        block-device: vdb
+        overwrite: "true"
+    swift-storage-z3:
+      branch: https://github.com/openstack/charm-swift-storage
+      constraints: mem=1G
+      options:
+        zone: 3
+        block-device: vdb
+        overwrite: "true"
+    ceilometer:
+      branch: https://github.com/openstack/charm-ceilometer
+      constraints: mem=1G
+    ceilometer-agent:
+      branch: https://github.com/openstack/charm-ceilometer-agent
+    heat:
+      branch: https://github.com/openstack/charm-heat
+    mongodb:
+      branch: lp:charms/trusty/mongodb
+      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 ]
+    - [ glance, rabbitmq-server ]
+    - [ cinder, mysql ]
+    - [ cinder, rabbitmq-server ]
+    - [ cinder, nova-cloud-controller ]
+    - [ cinder, keystone ]
+    - [ cinder, cinder-ceph ]
+    - [ cinder-ceph, ceph ]
+    - [ 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: https://github.com/openstack/charm-neutron-api
+      constraints: mem=1G
+      options:
+        neutron-security-groups: True
+    neutron-openvswitch:
+      branch: https://github.com/openstack/charm-neutron-openvswitch
+  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: https://github.com/openstack/charm-neutron-api
+      constraints: mem=1G
+      options:
+        neutron-security-groups: True
+    neutron-openvswitch:
+      branch: https://github.com/openstack/charm-neutron-openvswitch
+    rabbitmq-server-neutron:
+      branch: https://github.com/openstack/charm-rabbitmq-server;stable/16.04
+      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-icehouse
+  series: precise
+  services:
+    mysql:
+      branch: lp:charms/trusty/mysql
+  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"
+# 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
+# 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
+# mitaka
+trusty-mitaka:
+  inherits: openstack-icehouse
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-mitaka
+    source: cloud:trusty-mitaka
+trusty-mitaka-proposed:
+  inherits: trusty-mitaka
+  overrides:
+    openstack-origin: cloud:trusty-mitaka/proposed
+    source: cloud:trusty-mitaka/proposed
+trusty-mitaka-staging:
+  inherits: trusty-mitaka
+  overrides:
+    openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging
+    source: ppa:ubuntu-cloud-archive/mitaka-staging
+xenial-mitaka:
+  inherits: openstack-icehouse
+  series: xenial
+xenial-mitaka-proposed:
+  inherits: xenial-mitaka
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed
+# newton
+xenial-newton:
+  inherits: openstack-icehouse
+  series: xenial
+  overrides:
+    openstack-origin: cloud:xenial-newton
+    source: cloud:xenial-newton
+xenial-newton-proposed:
+  inherits: xenial-newton
+  overrides:
+    openstack-origin: cloud:xenial-newton/proposed
+    source: cloud:xenial-newton/proposed
+xenial-newton-staging:
+  inherits: xenial-newton
+  overrides:
+    openstack-origin: ppa:ubuntu-cloud-archive/newton-staging
+    source: ppa:ubuntu-cloud-archive/newton-staging
+xenial-newton-branch:
+  inherits: xenial-newton
+  overrides:
+    openstack-origin: ppa:openstack-ubuntu-testing/newton
+    source: ppa:openstack-ubuntu-testing/newton
+yakkety-newton:
+  inherits: openstack-icehouse
+  series: yakkety
+yakkety-newton-proposed:
+  inherits: yakkety-newton
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed
+yakkety-newton-branch:
+  inherits: yakkety-newton
+  overrides:
+    openstack-origin: ppa:openstack-ubuntu-testing/newton
+    source: ppa:openstack-ubuntu-testing/newton

=== modified file 'bundles/sparse/default.yaml'
--- bundles/sparse/default.yaml	2016-05-03 19:47:28 +0000
+++ bundles/sparse/default.yaml	2016-06-09 17:29:17 +0000
@@ -1,16 +1,8 @@
 # vim: set ts=2 et:
 # deployer bundle for stable charms
 # UOSCI relies on this for OS-on-OS deployment testing
-openstack-services:
+base-services:
   services:
-    mysql:
-      branch: https://github.com/openstack/charm-percona-cluster;stable/16.04
-      constraints: mem=4G
-      options:
-        dataset-size: 50%
-        max-connections: 20000
-        root-password: ChangeMe123
-        sst-password: ChangeMe123
     rabbitmq-server:
       branch: https://github.com/openstack/charm-rabbitmq-server;stable/16.04
       constraints: mem=1G
@@ -52,6 +44,13 @@
       constraints: mem=1G
       options:
         instance-mtu: 1300
+    neutron-api:
+      branch: https://github.com/openstack/charm-neutron-api;stable/16.04
+      constraints: mem=1G
+      options:
+        neutron-security-groups: True
+    neutron-openvswitch:
+      branch: https://github.com/openstack/charm-neutron-openvswitch;stable/16.04
     cinder:
       branch: https://github.com/openstack/charm-cinder;stable/16.04
       options:
@@ -139,60 +138,39 @@
     - [ 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: https://github.com/openstack/charm-neutron-api;stable/16.04
-      constraints: mem=1G
-      options:
-        neutron-security-groups: True
-    neutron-openvswitch:
-      branch: https://github.com/openstack/charm-neutron-openvswitch;stable/16.04
-  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: https://github.com/openstack/charm-neutron-api;stable/16.04
-      constraints: mem=1G
-      options:
-        neutron-security-groups: True
-    neutron-openvswitch:
-      branch: https://github.com/openstack/charm-neutron-openvswitch;stable/16.04
-    rabbitmq-server-neutron:
-      branch: https://github.com/openstack/charm-rabbitmq-server;stable/16.04
-      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 ]
+    - [ 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-services-legacy:
+  inherits: base-services
+  services:
+    mysql:
+      branch: lp:charms/trusty/mysql
+      constraints: mem=2G
+      options:
+        dataset-size: 50%
+        max-connections: 20000
+openstack-services:
+  inherits: base-services
+  services:
+    mysql:
+      branch: https://github.com/openstack/charm-percona-cluster;stable/16.04
+      constraints: mem=4G
+      options:
+        dataset-size: 50%
+        max-connections: 20000
+        root-password: ChangeMe123
+        sst-password: ChangeMe123
 # icehouse
 precise-icehouse:
-  inherits: openstack-icehouse
+  inherits: openstack-services-legacy
   series: precise
-  services:
-    mysql:
-      branch: lp:charms/trusty/mysql
   overrides:
     openstack-origin: cloud:precise-icehouse
     source: cloud:precise-icehouse
@@ -212,10 +190,7 @@
     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
+  inherits: openstack-services
   series: trusty
 trusty-icehouse-proposed:
   inherits: trusty-icehouse
@@ -230,7 +205,7 @@
     offline-compression: "no"
 # kilo
 trusty-kilo:
-  inherits: openstack-icehouse
+  inherits: openstack-services
   series: trusty
   overrides:
     openstack-origin: cloud:trusty-kilo
@@ -247,7 +222,7 @@
     source: ppa:ubuntu-cloud-archive/kilo-staging
 # liberty
 trusty-liberty:
-  inherits: openstack-icehouse
+  inherits: openstack-services
   series: trusty
   overrides:
     openstack-origin: cloud:trusty-liberty
@@ -263,7 +238,7 @@
     openstack-origin: ppa:ubuntu-cloud-archive/liberty-staging
     source: ppa:ubuntu-cloud-archive/liberty-staging
 wily-liberty:
-  inherits: openstack-icehouse
+  inherits: openstack-services
   series: wily
 wily-liberty-proposed:
   inherits: wily-liberty
@@ -272,7 +247,7 @@
     openstack-origin: distro-proposed
 # mitaka
 trusty-mitaka:
-  inherits: openstack-icehouse
+  inherits: openstack-services
   series: trusty
   overrides:
     openstack-origin: cloud:trusty-mitaka
@@ -288,7 +263,7 @@
     openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging
     source: ppa:ubuntu-cloud-archive/mitaka-staging
 xenial-mitaka:
-  inherits: openstack-icehouse
+  inherits: openstack-services
   series: xenial
 xenial-mitaka-proposed:
   inherits: xenial-mitaka

=== modified file 'bundles/sparse/next.yaml'
--- bundles/sparse/next.yaml	2016-06-07 10:37:11 +0000
+++ bundles/sparse/next.yaml	2016-06-09 17:29:17 +0000
@@ -1,16 +1,8 @@
 # vim: set ts=2 et:
 # deployer bundle for development ('next') charms
 # UOSCI relies on this for OS-on-OS deployment testing
-openstack-services:
+base-services:
   services:
-    mysql:
-      branch: https://github.com/openstack/charm-percona-cluster
-      constraints: mem=4G
-      options:
-        dataset-size: 50%
-        max-connections: 20000
-        root-password: ChangeMe123
-        sst-password: ChangeMe123
     rabbitmq-server:
       branch: https://github.com/openstack/charm-rabbitmq-server
       constraints: mem=1G
@@ -52,6 +44,13 @@
       constraints: mem=1G
       options:
         instance-mtu: 1300
+    neutron-api:
+      branch: https://github.com/openstack/charm-neutron-api
+      constraints: mem=1G
+      options:
+        neutron-security-groups: True
+    neutron-openvswitch:
+      branch: https://github.com/openstack/charm-neutron-openvswitch
     cinder:
       branch: https://github.com/openstack/charm-cinder
       options:
@@ -139,60 +138,39 @@
     - [ 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: https://github.com/openstack/charm-neutron-api
-      constraints: mem=1G
-      options:
-        neutron-security-groups: True
-    neutron-openvswitch:
-      branch: https://github.com/openstack/charm-neutron-openvswitch
-  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: https://github.com/openstack/charm-neutron-api
-      constraints: mem=1G
-      options:
-        neutron-security-groups: True
-    neutron-openvswitch:
-      branch: https://github.com/openstack/charm-neutron-openvswitch
-    rabbitmq-server-neutron:
-      branch: https://github.com/openstack/charm-rabbitmq-server;stable/16.04
-      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 ]
+    - [ 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-services-legacy:
+  inherits: base-services
+  services:
+    mysql:
+      branch: lp:charms/trusty/mysql
+      constraints: mem=2G
+      options:
+        dataset-size: 50%
+        max-connections: 20000
+openstack-services:
+  inherits: base-services
+  services:
+    mysql:
+      branch: https://github.com/openstack/charm-percona-cluster
+      constraints: mem=4G
+      options:
+        dataset-size: 50%
+        max-connections: 20000
+        root-password: ChangeMe123
+        sst-password: ChangeMe123
 # icehouse
 precise-icehouse:
-  inherits: openstack-icehouse
+  inherits: openstack-services-legacy
   series: precise
-  services:
-    mysql:
-      branch: lp:charms/trusty/mysql
   overrides:
     openstack-origin: cloud:precise-icehouse
     source: cloud:precise-icehouse
@@ -212,10 +190,7 @@
     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
+  inherits: openstack-services
   series: trusty
 trusty-icehouse-proposed:
   inherits: trusty-icehouse
@@ -230,7 +205,7 @@
     offline-compression: "no"
 # kilo
 trusty-kilo:
-  inherits: openstack-icehouse
+  inherits: openstack-services
   series: trusty
   overrides:
     openstack-origin: cloud:trusty-kilo
@@ -247,7 +222,7 @@
     source: ppa:ubuntu-cloud-archive/kilo-staging
 # liberty
 trusty-liberty:
-  inherits: openstack-icehouse
+  inherits: openstack-services
   series: trusty
   overrides:
     openstack-origin: cloud:trusty-liberty
@@ -263,7 +238,7 @@
     openstack-origin: ppa:ubuntu-cloud-archive/liberty-staging
     source: ppa:ubuntu-cloud-archive/liberty-staging
 wily-liberty:
-  inherits: openstack-icehouse
+  inherits: openstack-services
   series: wily
 wily-liberty-proposed:
   inherits: wily-liberty
@@ -272,7 +247,7 @@
     openstack-origin: distro-proposed
 # mitaka
 trusty-mitaka:
-  inherits: openstack-icehouse
+  inherits: openstack-services
   series: trusty
   overrides:
     openstack-origin: cloud:trusty-mitaka
@@ -288,7 +263,7 @@
     openstack-origin: ppa:ubuntu-cloud-archive/mitaka-staging
     source: ppa:ubuntu-cloud-archive/mitaka-staging
 xenial-mitaka:
-  inherits: openstack-icehouse
+  inherits: openstack-services
   series: xenial
 xenial-mitaka-proposed:
   inherits: xenial-mitaka
@@ -297,7 +272,7 @@
     openstack-origin: distro-proposed
 # newton
 xenial-newton:
-  inherits: openstack-icehouse
+  inherits: openstack-services
   series: xenial
   overrides:
     openstack-origin: cloud:xenial-newton
@@ -318,7 +293,7 @@
     openstack-origin: ppa:openstack-ubuntu-testing/newton
     source: ppa:openstack-ubuntu-testing/newton
 yakkety-newton:
-  inherits: openstack-icehouse
+  inherits: openstack-services
   series: yakkety
 yakkety-newton-proposed:
   inherits: yakkety-newton