Merge lp:~zulcss/openstack-charm-testing/lxd-stable-updates into lp:openstack-charm-testing

[Chuck Short]

- Drop use of quantum-security-groups in next.yaml, no longer supported.
- Update nova-lxd to point to stable/mitaka now that its released.
- Fix typo in next.yaml bundle.

[Ryan Beisner (1chb1n)]

review: Approve

=== modified file 'bundles/lxd/next.yaml'
--- bundles/lxd/next.yaml	2016-03-22 17:02:55 +0000
+++ bundles/lxd/next.yaml	2016-04-11 15:18:04 +0000
@@ -36,7 +36,6 @@
       constraints: mem=1G
       options:
         network-manager: Neutron
-        quantum-security-groups: "yes"
         ram-allocation-ratio: 5.0
     neutron-gateway:
       branch: https://github.com/openstack/charm-neutron-gateway
 
=== modified file 'bundles/lxd/source/next.yaml'
--- bundles/lxd/source/next.yaml	2016-04-05 14:36:36 +0000
+++ bundles/lxd/source/next.yaml	2016-04-11 15:18:04 +0000
@@ -36,7 +36,6 @@
       constraints: mem=1G
       options:
         network-manager: Neutron
-        quantum-security-groups: "yes"
         ram-allocation-ratio: 5.0
     neutron-gateway:
       branch: https://github.com/openstack/charm-neutron-gateway
@@ -192,7 +191,7 @@
       options:
         openstack-origin-git: include-file://nova-mitaka.yaml
 xenial-mitaka:
-  inherits: openstack-master-git
+  inherits: openstack-mitaka-git
   series: xenial
   services:
     mysql:
 
=== modified file 'bundles/lxd/source/nova-mitaka.yaml'
--- bundles/lxd/source/nova-mitaka.yaml	2016-04-05 14:36:36 +0000
+++ bundles/lxd/source/nova-mitaka.yaml	2016-04-11 15:18:04 +0000
@@ -7,7 +7,7 @@
      branch: master}
   - {name: nova-compute-lxd,
      repository: 'https://github.com/lxc/nova-lxd',
-     branch: master}
+     branch: stable/mitaka}
   - {name: nova,
      repository: 'git://github.com/openstack/nova',
      branch: stable/mitaka}