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

[Chuck Short]

nova-lxd update for ocata.

[Ryan Beisner (1chb1n)]

review: Needs Information

[Ryan Beisner (1chb1n)]

Re: Trusty Nova-LXD - as far as I'm aware, that is untested/unsupported.

Re: nova-compute:mysql relation - I believe that is no longer necessary.

review: Needs Information

[lp:~zulcss/openstack-charm-testing/lxd-ocata-update]

266. By Chuck Short on 2017-01-31

fix up based on comments

[Ryan Beisner (1chb1n)]

After reviewing this in more detail, I have additional questions and input.

Historically, we've kept lxd/next.yaml nearly-identical to sparse/next.yaml, as both are automated and referenced as examples.

Why is this proposal removing swift, heat, ceilometer and ceph when the MP is billed as an Ocata bundle update?

review: Needs Information

[Ryan Beisner (1chb1n)]

We need the updated lxd next and default yaml bundle files as soon as possible for freeze/release testing and validation.

[Ryan Beisner (1chb1n)]

The code repo for this project is now at the following location:
https://github.com/openstack-charmers/openstack-charm-testing

review: Needs Resubmitting

Unmerged revisions

266. By Chuck Short on 2017-01-31

fix up based on comments

265. By Chuck Short on 2017-01-30

Resync nova-lxd bundle.

=== modified file 'bundles/lxd/next.yaml'
--- bundles/lxd/next.yaml	2016-12-07 14:33:09 +0000
+++ bundles/lxd/next.yaml	2017-01-31 16:38:41 +0000
@@ -6,6 +6,17 @@
     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
@@ -31,7 +42,7 @@
         network-manager: Neutron
     neutron-gateway:
       branch: https://github.com/openstack/charm-neutron-gateway
-      constraints: mem=2G
+      constraints: mem=4G
       options:
         instance-mtu: 1300
         bridge-mappings: physnet1:br-ex
@@ -46,52 +57,16 @@
     cinder:
       branch: https://github.com/openstack/charm-cinder
       options:
-        block-device: /dev/vdb
+        block-device: "None"
         glance-api-version: 2
-        ephemeral-unmount: /mnt
-        overwrite: "true"
-      constraints: mem=4G
+      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
     lxd:
       branch: https://github.com/openstack/charm-lxd
       options:
@@ -110,28 +85,20 @@
     - - nova-compute
       - rabbitmq-server:amqp
     - [ nova-compute, glance ]
+    - [ nova-compute, ceph ]
     - [ glance, mysql ]
     - [ glance, keystone ]
+    - [ glance, ceph ]
+    - [ glance, "cinder:image-service" ]
     - [ glance, rabbitmq-server ]
-    - [ glance, "cinder:image-service" ]
     - [ 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, ceilometer ]
-    - [ heat, mysql ]
-    - [ heat, keystone ]
-    - [ heat, rabbitmq-server ]
     - [ "neutron-gateway:amqp", rabbitmq-server ]
     - [ neutron-api, mysql ]
     - [ neutron-api, rabbitmq-server ]
@@ -225,11 +192,6 @@
   overrides:
     source: proposed
     openstack-origin: distro-proposed
-xenial-mitaka-branch:
-  inherits: xenial-mitaka
-  overrides:
-    source: ppa:openstack-ubuntu-testing/mitaka
-    openstack-origin: ppa:openstack-ubuntu-testing/mitaka
 xenial-mitaka-exclusive:
   inherits: openstack-services-exclusive
   series: xenial
@@ -274,3 +236,44 @@
   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-exclusive:
+  inherits: openstack-services-exclusive
+  series: xenial
+  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