OpenStack Charm Testing

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

  1. ocata-lxd-support
  2. Merge into trunk
Proposed by Chuck Short
Status: Merged
Approved by: Ryan Beisner
Approved revision: 276
Merged at revision: 276
Proposed branch: lp:~zulcss/openstack-charm-testing/ocata-lxd-support
Merge into: lp:openstack-charm-testing
Diff against target: 48 lines (+41/-0)
1 file modified
bundles/lxd/next.yaml (+41/-0)
To merge this branch: bzr merge lp:~zulcss/openstack-charm-testing/ocata-lxd-support
Reviewer Review Type Date Requested Status
Ryan Beisner Approve
Review via email: mp+317509@code.launchpad.net

Description of the change

Add basic ocata support.

To post a comment you must log in.
Revision history for this message
Ryan Beisner (1chb1n) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bundles/lxd/next.yaml'
2--- bundles/lxd/next.yaml 2016-12-07 14:33:09 +0000
3+++ bundles/lxd/next.yaml 2017-02-16 16:20:01 +0000
4@@ -274,3 +274,44 @@
5 overrides:
6 openstack-origin: ppa:openstack-ubuntu-testing/newton
7 source: ppa:openstack-ubuntu-testing/newton
8+# ocata
9+xenial-ocata:
10+ #NOTE(coreycb): Temporarily disable reactive charms until
11+ # https://bugs.launchpad.net/bugs/1643027 is resolved.
12+ #inherits: openstack-services-xenial
13+ inherits: openstack-services
14+ series: xenial
15+ overrides:
16+ openstack-origin: cloud:xenial-ocata
17+ source: cloud:xenial-ocata
18+xenial-ocata-proposed:
19+ inherits: xenial-ocata
20+ overrides:
21+ openstack-origin: cloud:xenial-ocata/proposed
22+ source: cloud:xenial-ocata/proposed
23+xenial-ocata-staging:
24+ inherits: xenial-ocata
25+ overrides:
26+ openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging
27+ source: ppa:ubuntu-cloud-archive/ocata-staging
28+xenial-ocata-branch:
29+ inherits: xenial-ocata
30+ overrides:
31+ openstack-origin: ppa:openstack-ubuntu-testing/ocata
32+ source: ppa:openstack-ubuntu-testing/ocata
33+zesty-ocata:
34+ #NOTE(coreycb): Temporarily disable reactive charms until
35+ # https://bugs.launchpad.net/bugs/1643027 is resolved.
36+ #inherits: openstack-services-xenial
37+ inherits: openstack-services
38+ series: zesty
39+zesty-ocata-proposed:
40+ inherits: zesty-ocata
41+ overrides:
42+ source: proposed
43+ openstack-origin: distro-proposed
44+zesty-ocata-branch:
45+ inherits: zesty-ocata
46+ overrides:
47+ openstack-origin: ppa:openstack-ubuntu-testing/ocata
48+ source: ppa:openstack-ubuntu-testing/ocata

Subscribers

People subscribed via source and target branches

to status/vote changes: