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

[Chuck Short]

- Add support for newton for lxd bundles
- Add support for newton for the dfs lxd bundles.

[Ryan Beisner (1chb1n)]

review: Approve

=== modified file 'bundles/lxd/default.yaml'
--- bundles/lxd/default.yaml	2016-06-04 22:55:27 +0000
+++ bundles/lxd/default.yaml	2016-06-24 18:55:07 +0000
@@ -1,15 +1,8 @@
 # vim: set ts=2 et:
-# deployer bundle for development (stable/trunk) charms
+# deployer bundle for stable charms
 # UOSCI relies on this for OS-on-OS deployment testing
-openstack-services:
+base-services:
   services:
-    mysql:
-      branch: lp:charms/trusty/mysql
-      #https://github.com/openstack/charm-percona-cluster
-      constraints: mem=1G
-      options:
-        dataset-size: 50%
-        max-connections: 20000
     rabbitmq-server:
       branch: https://github.com/openstack/charm-rabbitmq-server;stable/16.04
       constraints: mem=1G
@@ -36,12 +29,18 @@
       constraints: mem=1G
       options:
         network-manager: Neutron
-        ram-allocation-ratio: 5.0
     neutron-gateway:
       branch: https://github.com/openstack/charm-neutron-gateway;stable/16.04
       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
     glance:
       branch: https://github.com/openstack/charm-glance;stable/16.04
       constraints: mem=1G
@@ -97,15 +96,14 @@
     - [ nova-cloud-controller, glance ]
     - [ nova-cloud-controller, keystone ]
     - [ nova-compute, nova-cloud-controller ]
+    - [ nova-compute, mysql ]
     - [ nova-compute, lxd ]
-    - [ nova-compute, mysql ]
     - - nova-compute
       - rabbitmq-server:amqp
     - [ nova-compute, glance ]
     - [ glance, mysql ]
     - [ glance, keystone ]
     - [ glance, rabbitmq-server ]
-    - [ glance, swift-proxy ]
     - [ neutron-gateway, nova-cloud-controller ]
     - [ openstack-dashboard, keystone ]
     - [ swift-proxy, keystone ]
@@ -121,41 +119,47 @@
     - [ 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 ]
-# Liberty
+    - [ 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
+# liberty
 wily-liberty:
-  inherits: openstack-icehouse
+  inherits: openstack-services
   series: wily
 wily-liberty-proposed:
   inherits: wily-liberty
   overrides:
     source: proposed
     openstack-origin: distro-proposed
-# Mitaka
+# mitaka
 xenial-mitaka:
-  inherits: openstack-icehouse
+  inherits: openstack-services
   series: xenial
 xenial-mitaka-proposed:
   inherits: xenial-mitaka
 
=== modified file 'bundles/lxd/next.yaml'
--- bundles/lxd/next.yaml	2016-06-08 15:01:45 +0000
+++ bundles/lxd/next.yaml	2016-06-24 18:55:07 +0000
@@ -1,15 +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: lp:charms/trusty/mysql
-      #https://github.com/openstack/charm-percona-cluster
-      constraints: mem=1G
-      options:
-        dataset-size: 50%
-        max-connections: 20000
     rabbitmq-server:
       branch: https://github.com/openstack/charm-rabbitmq-server
       constraints: mem=1G
@@ -36,12 +29,20 @@
       constraints: mem=1G
       options:
         network-manager: Neutron
-        ram-allocation-ratio: 5.0
     neutron-gateway:
       branch: https://github.com/openstack/charm-neutron-gateway
       constraints: mem=1G
       options:
         instance-mtu: 1300
+        bridge-mappings: physnet1:br-ex
+    neutron-api:
+      branch: https://github.com/openstack/charm-neutron-api
+      constraints: mem=1G
+      options:
+        neutron-security-groups: True
+        flat-network-providers: physnet1
+    neutron-openvswitch:
+      branch: https://github.com/openstack/charm-neutron-openvswitch
     glance:
       branch: https://github.com/openstack/charm-glance
       constraints: mem=1G
@@ -97,15 +98,14 @@
     - [ nova-cloud-controller, glance ]
     - [ nova-cloud-controller, keystone ]
     - [ nova-compute, nova-cloud-controller ]
+    - [ nova-compute, mysql ]
     - [ nova-compute, lxd ]
-    - [ nova-compute, mysql ]
     - - nova-compute
       - rabbitmq-server:amqp
     - [ nova-compute, glance ]
     - [ glance, mysql ]
     - [ glance, keystone ]
     - [ glance, rabbitmq-server ]
-    - [ glance, swift-proxy ]
     - [ neutron-gateway, nova-cloud-controller ]
     - [ openstack-dashboard, keystone ]
     - [ swift-proxy, keystone ]
@@ -121,44 +121,85 @@
     - [ 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 ]
-# Liberty
+    - [ 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
+# liberty
 wily-liberty:
-  inherits: openstack-icehouse
+  inherits: openstack-services
   series: wily
 wily-liberty-proposed:
   inherits: wily-liberty
   overrides:
     source: proposed
     openstack-origin: distro-proposed
-# Mitaka
+# mitaka
 xenial-mitaka:
-  inherits: openstack-icehouse
+  inherits: openstack-services
   series: xenial
 xenial-mitaka-proposed:
   inherits: xenial-mitaka
   overrides:
     source: proposed
     openstack-origin: distro-proposed
+# newton
+xenial-newton:
+  inherits: openstack-services
+  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-services
+  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/lxd/source/default.yaml'
--- bundles/lxd/source/default.yaml	2016-06-04 22:55:27 +0000
+++ bundles/lxd/source/default.yaml	2016-06-24 18:55:07 +0000
@@ -201,3 +201,44 @@
   overrides:
     source: proposed
     openstack-origin: distro-proposed
+# newton
+openstack-newton-git:
+  inherits: openstack-icehouse
+  services:
+    nova-compute:
+      options:
+      openstack-origin-git: include-file://nova-master.yaml
+xenial-newton:
+  inherits: openstack-newton-git
+  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-newton-git
+  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/lxd/source/next.yaml'
--- bundles/lxd/source/next.yaml	2016-06-04 22:55:27 +0000
+++ bundles/lxd/source/next.yaml	2016-06-24 18:55:07 +0000
@@ -201,3 +201,44 @@
   overrides:
     source: proposed
     openstack-origin: distro-proposed
+# newton
+openstack-newton-git:
+  inherits: openstack-icehouse
+  services:
+    nova-compute:
+      options:
+        openstack-origin-git: include-file://nova-master.yaml
+xenial-newton:
+  inherits: openstack-newton-git
+  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-newton-git
+  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/lxd/source/nova-master.yaml'
--- bundles/lxd/source/nova-master.yaml	2016-06-04 22:55:27 +0000
+++ bundles/lxd/source/nova-master.yaml	2016-06-24 18:55:07 +0000
@@ -1,12 +1,12 @@
 repositories:
   - {name: requirements,
-     repository: 'git://github.com/zulcss/requirements',
+     repository: 'git://github.com/openstack/requirements',
      branch: master}
   - {name: pylxd,
      repository: 'https://github.com/lxc/pylxd',
      branch: master}
   - {name: nova-compute-lxd,
-     repository: 'https://github.com/lxc/nova-lxd',
+     repository: 'https://github.com/openstack/nova-lxd',
      branch: master}
   - {name: nova,
      repository: 'git://github.com/openstack/nova',
 
=== modified file 'bundles/lxd/source/nova-mitaka.yaml'
--- bundles/lxd/source/nova-mitaka.yaml	2016-06-04 22:55:27 +0000
+++ bundles/lxd/source/nova-mitaka.yaml	2016-06-24 18:55:07 +0000
@@ -6,7 +6,7 @@
      repository: 'https://github.com/lxc/pylxd',
      branch: master}
   - {name: nova-compute-lxd,
-     repository: 'https://github.com/lxc/nova-lxd',
+     repository: 'https://github.com/openstack/nova-lxd',
      branch: stable/mitaka}
   - {name: nova,
      repository: 'git://github.com/openstack/nova',