Merge lp:~zulcss/openstack-charm-testing/ocata-support into lp:openstack-charm-testing

[Chuck Short]

Add support to deploy ocata on xenial and zesty.

[Ryan Beisner (1chb1n)]

Thanks for the mods.

review: Approve

=== modified file 'bundles/sparse/next.yaml'
--- bundles/sparse/next.yaml	2016-09-29 12:56:01 +0000
+++ bundles/sparse/next.yaml	2016-11-11 17:46:20 +0000
@@ -308,3 +308,38 @@
   overrides:
     openstack-origin: ppa:openstack-ubuntu-testing/newton
     source: ppa:openstack-ubuntu-testing/newton
+# ocata
+xenial-ocata:
+  inherits: openstack-services
+  series: xenial
+  overrides:
+    openstack-origin: cloud:xenial-octata
+    source: cloud:xenial-ocata
+xenial-ocata-proposed:
+  inherits: xenial-ocata
+  overrides:
+    openstack-origin: cloud:xenial-ocata/proposed
+    source: cloud:xenial-ocata/proposed
+xenial-ocata-staging:
+  inherits: xenial-ocata
+  overrides:
+    openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging
+    source: ppa:ubuntu-cloud-archive/ocata-staging
+xenial-ocata-branch:
+  inherits: xenial-ocata
+  overrides:
+    openstack-origin: ppa:openstack-ubuntu-testing/ocata
+    source: ppa:openstack-ubuntu-testing/ocata
+zesty-ocata:
+  inherits: openstack-services
+  series: zesty
+zesty-ocata-proposed:
+  inherits: zesty-ocata
+  overrides:
+    source: proposed
+    openstack-origin: distro-proposed
+zesty-ocata-branch:
+  inherits: zesty-ocata
+  overrides:
+    openstack-origin: ppa:openstack-ubuntu-testing/ocata
+    source: ppa:openstack-ubuntu-testing/ocata