Merge lp:~zulcss/openstack-charm-testing/nova-lxd-dfs into lp:openstack-charm-testing

[Chuck Short]

nova-lxd deploy from source fixes.

=== added file 'bundles/lxd/glance-kilo.yaml'
--- bundles/lxd/glance-kilo.yaml	1970-01-01 00:00:00 +0000
+++ bundles/lxd/glance-kilo.yaml	2016-02-19 16:56:07 +0000
@@ -0,0 +1,10 @@
+repositories:
+  - {name: requirements,
+     repository: 'git://github.com/openstack/requirements',
+     branch: stable/kilo}
+  - {name: glance,
+     repository: 'git://github.com/openstack/glance',
+     branch: stable/kilo}
+directory: /mnt/openstack-git
+http_proxy: http://squid.internal:3128
+https_proxy: http://squid.internal:3128

=== added file 'bundles/lxd/glance-liberty.yaml'
--- bundles/lxd/glance-liberty.yaml	1970-01-01 00:00:00 +0000
+++ bundles/lxd/glance-liberty.yaml	2016-02-19 16:56:07 +0000
@@ -0,0 +1,10 @@
+repositories:
+  - {name: requirements,
+     repository: 'git://github.com/openstack/requirements',
+     branch: stable/liberty}
+  - {name: glance,
+     repository: 'git://github.com/openstack/glance',
+     branch: stable/liberty}
+directory: /mnt/openstack-git
+http_proxy: http://squid.internal:3128
+https_proxy: http://squid.internal:3128

=== added file 'bundles/lxd/glance-master.yaml'
--- bundles/lxd/glance-master.yaml	1970-01-01 00:00:00 +0000
+++ bundles/lxd/glance-master.yaml	2016-02-19 16:56:07 +0000
@@ -0,0 +1,10 @@
+repositories:
+  - {name: requirements,
+     repository: 'git://github.com/zulcss/requirements',
+     branch: master}
+  - {name: glance,
+     repository: 'git://github.com/openstack/glance',
+     branch: 12.0.0.0b2}
+directory: /mnt/openstack-git
+http_proxy: http://squid.internal:3128
+https_proxy: http://squid.internal:3128

=== added file 'bundles/lxd/horizon-kilo.yaml'
--- bundles/lxd/horizon-kilo.yaml	1970-01-01 00:00:00 +0000
+++ bundles/lxd/horizon-kilo.yaml	2016-02-19 16:56:07 +0000
@@ -0,0 +1,10 @@
+repositories:
+  - {name: requirements,
+     repository: 'git://github.com/openstack/requirements',
+     branch: stable/kilo}
+  - {name: horizon,
+     repository: 'git://github.com/openstack/horizon',
+     branch: stable/kilo}
+directory: /mnt/openstack-git
+http_proxy: http://squid.internal:3128
+https_proxy: http://squid.internal:3128

=== added file 'bundles/lxd/horizon-liberty.yaml'
--- bundles/lxd/horizon-liberty.yaml	1970-01-01 00:00:00 +0000
+++ bundles/lxd/horizon-liberty.yaml	2016-02-19 16:56:07 +0000
@@ -0,0 +1,10 @@
+repositories:
+  - {name: requirements,
+     repository: 'git://github.com/openstack/requirements',
+     branch: stable/liberty}
+  - {name: horizon,
+     repository: 'git://github.com/openstack/horizon',
+     branch: stable/liberty}
+directory: /mnt/openstack-git
+http_proxy: http://squid.internal:3128
+https_proxy: http://squid.internal:3128

=== added file 'bundles/lxd/horizon-master.yaml'
--- bundles/lxd/horizon-master.yaml	1970-01-01 00:00:00 +0000
+++ bundles/lxd/horizon-master.yaml	2016-02-19 16:56:07 +0000
@@ -0,0 +1,10 @@
+repositories:
+  - {name: requirements,
+     repository: 'git://github.com/zulcss/requirements',
+     branch: master}
+  - {name: horizon,
+     repository: 'git://github.com/openstack/horizon',
+     branch:  9.0.0.0b2}
+directory: /mnt/openstack-git
+http_proxy: http://squid.internal:3128
+https_proxy: http://squid.internal:3128

=== added file 'bundles/lxd/keystone-kilo.yaml'
--- bundles/lxd/keystone-kilo.yaml	1970-01-01 00:00:00 +0000
+++ bundles/lxd/keystone-kilo.yaml	2016-02-19 16:56:07 +0000
@@ -0,0 +1,10 @@
+repositories:
+  - {name: requirements,
+     repository: 'git://github.com/openstack/requirements',
+     branch: stable/kilo}
+  - {name: keystone,
+     repository: 'git://github.com/openstack/keystone',
+     branch: stable/kilo}
+directory: /mnt/openstack-git
+http_proxy: http://squid.internal:3128
+https_proxy: http://squid.internal:3128

=== added file 'bundles/lxd/keystone-liberty.yaml'
--- bundles/lxd/keystone-liberty.yaml	1970-01-01 00:00:00 +0000
+++ bundles/lxd/keystone-liberty.yaml	2016-02-19 16:56:07 +0000
@@ -0,0 +1,10 @@
+repositories:
+  - {name: requirements,
+     repository: 'git://github.com/openstack/requirements',
+     branch: stable/liberty}
+  - {name: keystone,
+     repository: 'git://github.com/openstack/keystone',
+     branch: stable/liberty}
+directory: /mnt/openstack-git
+http_proxy: http://squid.internal:3128
+https_proxy: http://squid.internal:3128

=== added file 'bundles/lxd/keystone-master.yaml'
--- bundles/lxd/keystone-master.yaml	1970-01-01 00:00:00 +0000
+++ bundles/lxd/keystone-master.yaml	2016-02-19 16:56:07 +0000
@@ -0,0 +1,10 @@
+repositories:
+  - {name: requirements,
+     repository: 'git://github.com/zulcss/requirements',
+     branch: master}
+  - {name: keystone,
+     repository: 'git://github.com/openstack/keystone',
+     branch: 9.0.0.0b2}
+directory: /mnt/openstack-git
+http_proxy: http://squid.internal:3128
+https_proxy: http://squid.internal:3128

=== added file 'bundles/lxd/lxd.yaml'
--- bundles/lxd/lxd.yaml	1970-01-01 00:00:00 +0000
+++ bundles/lxd/lxd.yaml	2016-02-19 16:56:07 +0000
@@ -0,0 +1,333 @@
+# vim: set ts=2 et:
+# deployer bundle for development ('next') charms
+# UOSCI relies on this for OS-on-OS deployment testing
+openstack-services:
+  services:
+    mysql:
+      branch: lp:~openstack-charmers/charms/trusty/percona-cluster/next
+      constraints: mem=4G
+      options:
+        dataset-size: 50%
+        max-connections: 20000
+#        root-password: changeme
+#        sst-password: changeme
+    rabbitmq-server:
+      branch: lp:~openstack-charmers/charms/trusty/rabbitmq-server/next
+      constraints: mem=1G
+    keystone:
+      branch: lp:~openstack-charmers/charms/trusty/keystone/next
+      constraints: mem=1G
+      options:
+        admin-password: openstack
+        admin-token: ubuntutesting
+    openstack-dashboard:
+      branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
+      constraints: mem=1G
+    nova-compute:
+      branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
+      num_units: 1
+      constraints: mem=4G
+      options:
+        enable-live-migration: True
+        enable-resize: True
+        migration-auth-type: ssh
+        virt-type: lxd
+    nova-cloud-controller:
+      branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
+      constraints: mem=1G
+      options:
+        network-manager: Neutron
+        quantum-security-groups: "yes"
+    neutron-gateway:
+      branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next
+      constraints: mem=1G
+      options:
+        instance-mtu: 1300
+    glance:
+      branch: lp:~openstack-charmers/charms/trusty/glance/next
+      constraints: mem=1G
+    lxd:
+      branch: lp:~zulcss/charms/trusty/lxd/lxd-2.0
+      options:
+        block-device: /mnt/disk.img|20G
+        storage-type: btrfs
+        lxd-origin: ppa:ubuntu-lxc/lxd-git-master
+  relations:
+    - [ keystone, mysql ]
+    - [ nova-cloud-controller, mysql ]
+    - [ nova-cloud-controller, rabbitmq-server ]
+    - [ nova-cloud-controller, glance ]
+    - [ nova-cloud-controller, keystone ]
+    - [ nova-compute, nova-cloud-controller ]
+    - [ nova-compute, mysql ]
+    - [ nova-compute, lxd ]
+    - - nova-compute
+      - rabbitmq-server:amqp
+    - [ nova-compute, glance ]
+    - [ glance, mysql ]
+    - [ glance, keystone ]
+    - [ neutron-gateway, mysql ]
+    - [ neutron-gateway, nova-cloud-controller ]
+    - [ openstack-dashboard, keystone ]
+openstack-singlerabbit:
+  inherits: openstack-services
+  relations:
+    - [ "neutron-gateway:amqp", rabbitmq-server ]
+openstack-icehouse:
+  inherits: openstack-singlerabbit
+  services:
+    neutron-api:
+      branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
+      constraints: mem=1G
+      options:
+        neutron-security-groups: True
+    neutron-openvswitch:
+      branch: lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next
+  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 ]
+openstack-icehouse-msg-split:
+  inherits: openstack-services
+  services:
+    neutron-api:
+      branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
+      constraints: mem=1G
+      options:
+        neutron-security-groups: True
+    neutron-openvswitch:
+      branch: lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next
+    rabbitmq-server-neutron:
+      branch: lp:charms/trusty/rabbitmq-server
+      constraints: mem=1G
+  relations:
+  - [ neutron-api, mysql ]
+  - [ neutron-api, rabbitmq-server-neutron ]
+  - [ neutron-api, nova-cloud-controller ]
+  - [ neutron-api, neutron-openvswitch ]
+  - [ neutron-api, keystone ]
+  - [ neutron-api, neutron-gateway ]
+  - [ neutron-openvswitch, nova-compute ]
+  - [ neutron-openvswitch, rabbitmq-server-neutron ]
+  - [ "neutron-gateway:amqp-nova", rabbitmq-server ]
+  - [ "neutron-gateway:amqp", rabbitmq-server-neutron ]
+# icehouse
+openstack-icehouse-git:
+  inherits: openstack-icehouse
+  services:
+    keystone:
+      options:
+        openstack-origin-git: include-file://keystone-icehouse.yaml
+    glance:
+      options:
+        openstack-origin-git: include-file://glance-icehouse.yaml
+    neutron-api:
+      options:
+        openstack-origin-git: include-file://neutron-icehouse.yaml
+    neutron-gateway:
+      options:
+        openstack-origin-git: include-file://neutron-icehouse.yaml
+    neutron-openvswitch:
+      options:
+        openstack-origin-git: include-file://neutron-icehouse.yaml
+    openstack-dashboard:
+      options:
+        openstack-origin-git: include-file://horizon-icehouse.yaml
+    nova-compute:
+      options:
+        openstack-origin-git: include-file://nova-icehouse.yaml
+    nova-cloud-controller:
+      options:
+        openstack-origin-git: include-file://nova-icehouse.yaml
+precise-icehouse:
+  inherits: openstack-icehouse-git
+  series: precise
+  services:
+    mysql:
+      branch: lp:charms/trusty/mysql
+  overrides:
+    openstack-origin: cloud:precise-icehouse
+    source: cloud:precise-icehouse
+trusty-icehouse:
+  inherits: openstack-icehouse-git
+  series: trusty
+# juno
+openstack-juno-git:
+  inherits: openstack-icehouse
+  services:
+    keystone:
+      options:
+        openstack-origin-git: include-file://keystone-juno.yaml
+    glance:
+      options:
+        openstack-origin-git: include-file://glance-juno.yaml
+    neutron-api:
+      options:
+        openstack-origin-git: include-file://neutron-juno.yaml
+    neutron-gateway:
+      options:
+        openstack-origin-git: include-file://neutron-juno.yaml
+    neutron-openvswitch:
+      options:
+        openstack-origin-git: include-file://neutron-juno.yaml
+    openstack-dashboard:
+      options:
+        openstack-origin-git: include-file://horizon-juno.yaml
+    nova-compute:
+      options:
+        openstack-origin-git: include-file://nova-juno.yaml
+    nova-cloud-controller:
+      options:
+        openstack-origin-git: include-file://nova-juno.yaml
+trusty-juno:
+  inherits: openstack-juno-git
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-juno
+    source: cloud:trusty-juno
+utopic-juno:
+  inherits: openstack-juno-git
+  series: utopic
+# kilo
+openstack-kilo-git:
+  inherits: openstack-icehouse
+  services:
+    keystone:
+      options:
+        openstack-origin-git: include-file://keystone-kilo.yaml
+    glance:
+      options:
+        openstack-origin-git: include-file://glance-kilo.yaml
+    neutron-api:
+      options:
+        openstack-origin-git: include-file://neutron-kilo.yaml
+    neutron-gateway:
+      options:
+        openstack-origin-git: include-file://neutron-kilo.yaml
+    neutron-openvswitch:
+      options:
+        openstack-origin-git: include-file://neutron-kilo.yaml
+    openstack-dashboard:
+      options:
+        openstack-origin-git: include-file://horizon-kilo.yaml
+    nova-compute:
+      options:
+        openstack-origin-git: include-file://nova-kilo.yaml
+    nova-cloud-controller:
+      options:
+        openstack-origin-git: include-file://nova-kilo.yaml
+trusty-kilo:
+  inherits: openstack-kilo-git
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-kilo
+    source: cloud:trusty-kilo
+trusty-kilo-proposed:
+  inherits: openstack-kilo-git
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-kilo/proposed
+    source: cloud:trusty-kilo/proposed
+vivid-kilo:
+  inherits: openstack-kilo-git
+  series: vivid
+  services:
+    mysql:
+      branch: lp:charms/trusty/mysql
+# liberty
+openstack-liberty-git:
+  inherits: openstack-icehouse
+  services:
+    keystone:
+      options:
+        openstack-origin-git: include-file://keystone-liberty.yaml
+    glance:
+      options:
+        openstack-origin-git: include-file://glance-liberty.yaml
+    neutron-api:
+      options:
+        openstack-origin-git: include-file://neutron-liberty.yaml
+    neutron-gateway:
+      options:
+        openstack-origin-git: include-file://neutron-liberty.yaml
+    neutron-openvswitch:
+      options:
+        openstack-origin-git: include-file://neutron-liberty.yaml
+    openstack-dashboard:
+      options:
+        openstack-origin-git: include-file://horizon-liberty.yaml
+    nova-compute:
+      options:
+        openstack-origin-git: include-file://nova-liberty.yaml
+    nova-cloud-controller:
+      options:
+        openstack-origin-git: include-file://nova-liberty.yaml
+trusty-liberty:
+  inherits: openstack-liberty-git
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-liberty
+    source: cloud:trusty-liberty
+trusty-liberty-proposed:
+  inherits: openstack-liberty-git
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-liberty/proposed
+    source: cloud:trusty-liberty/proposed
+wily-liberty:
+  inherits: openstack-liberty-git
+  series: wily
+  services:
+    mysql:
+      branch: lp:charms/trusty/mysql
+# master
+openstack-master-git:
+  inherits: openstack-icehouse
+  services:
+    keystone:
+      options:
+        openstack-origin-git: include-file://keystone-master.yaml
+    glance:
+      options:
+        openstack-origin-git: include-file://glance-master.yaml
+    neutron-api:
+      options:
+        openstack-origin-git: include-file://neutron-master.yaml
+    neutron-gateway:
+      options:
+        openstack-origin-git: include-file://neutron-master.yaml
+    neutron-openvswitch:
+      options:
+        openstack-origin-git: include-file://neutron-master.yaml
+    openstack-dashboard:
+      options:
+        openstack-origin-git: include-file://horizon-master.yaml
+    nova-compute:
+      options:
+        openstack-origin-git: include-file://nova-master.yaml
+    nova-cloud-controller:
+      options:
+        openstack-origin-git: include-file://nova-master.yaml
+trusty-master:
+  inherits: openstack-master-git
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-mitaka
+    source: cloud:trusty-mitaka
+trusty-master-proposed:
+  inherits: openstack-master-git
+  series: trusty
+  overrides:
+    openstack-origin: cloud:trusty-mitaka/proposed
+    source: cloud:trusty-mitaka/proposed
+xenial-master:
+  inherits: openstack-master-git
+  series: xenial
+  services:
+    mysql:
+      branch: lp:charms/trusty/mysql

=== added file 'bundles/lxd/neutron-kilo.yaml'
--- bundles/lxd/neutron-kilo.yaml	1970-01-01 00:00:00 +0000
+++ bundles/lxd/neutron-kilo.yaml	2016-02-19 16:56:07 +0000
@@ -0,0 +1,19 @@
+repositories:
+  - {name: requirements,
+     repository: 'git://github.com/openstack/requirements',
+     branch: stable/kilo}
+  - {name: neutron-fwaas,
+     repository: 'git://github.com/openstack/neutron-fwaas',
+     branch: stable/kilo}
+  - {name: neutron-lbaas,
+     repository: 'git://github.com/openstack/neutron-lbaas',
+     branch: stable/kilo}
+  - {name: neutron-vpnaas,
+     repository: 'git://github.com/openstack/neutron-vpnaas',
+     branch: stable/kilo}
+  - {name: neutron,
+     repository: 'git://github.com/openstack/neutron',
+     branch: stable/kilo}
+directory: /mnt/openstack-git
+http_proxy: http://squid.internal:3128
+https_proxy: http://squid.internal:3128

=== added file 'bundles/lxd/neutron-liberty.yaml'
--- bundles/lxd/neutron-liberty.yaml	1970-01-01 00:00:00 +0000
+++ bundles/lxd/neutron-liberty.yaml	2016-02-19 16:56:07 +0000
@@ -0,0 +1,19 @@
+repositories:
+  - {name: requirements,
+     repository: 'git://github.com/openstack/requirements',
+     branch: stable/liberty}
+  - {name: neutron-fwaas,
+     repository: 'git://github.com/openstack/neutron-fwaas',
+     branch: stable/liberty}
+  - {name: neutron-lbaas,
+     repository: 'git://github.com/openstack/neutron-lbaas',
+     branch: stable/liberty}
+  - {name: neutron-vpnaas,
+     repository: 'git://github.com/openstack/neutron-vpnaas',
+     branch: stable/liberty}
+  - {name: neutron,
+     repository: 'git://github.com/openstack/neutron',
+     branch: stable/liberty}
+directory: /mnt/openstack-git
+http_proxy: http://squid.internal:3128
+https_proxy: http://squid.internal:3128

=== added file 'bundles/lxd/neutron-master.yaml'
--- bundles/lxd/neutron-master.yaml	1970-01-01 00:00:00 +0000
+++ bundles/lxd/neutron-master.yaml	2016-02-19 16:56:07 +0000
@@ -0,0 +1,19 @@
+repositories:
+  - {name: requirements,
+     repository: 'git://github.com/zulcss/requirements',
+     branch: master}
+  - {name: neutron-fwaas,
+     repository: 'git://github.com/openstack/neutron-fwaas',
+     branch: 8.0.0.0b2}
+  - {name: neutron-lbaas,
+     repository: 'git://github.com/openstack/neutron-lbaas',
+     branch: 8.0.0.0b2}
+  - {name: neutron-vpnaas,
+     repository: 'git://github.com/openstack/neutron-vpnaas',
+     branch: 8.0.0.0b2}
+  - {name: neutron,
+     repository: 'git://github.com/openstack/neutron',
+     branch: 8.0.0.0b2}
+directory: /mnt/openstack-git
+http_proxy: http://squid.internal:3128
+https_proxy: http://squid.internal:3128

=== added file 'bundles/lxd/nova-kilo.yaml'
--- bundles/lxd/nova-kilo.yaml	1970-01-01 00:00:00 +0000
+++ bundles/lxd/nova-kilo.yaml	2016-02-19 16:56:07 +0000
@@ -0,0 +1,13 @@
+repositories:
+  - {name: requirements,
+     repository: 'git://github.com/openstack/requirements',
+     branch: stable/kilo}
+  - {name: neutron,
+     repository: 'git://github.com/openstack/neutron',
+     branch: stable/kilo}
+  - {name: nova,
+     repository: 'git://github.com/openstack/nova',
+     branch: stable/kilo}
+directory: /mnt/openstack-git
+http_proxy: http://squid.internal:3128
+https_proxy: http://squid.internal:3128

=== added file 'bundles/lxd/nova-liberty.yaml'
--- bundles/lxd/nova-liberty.yaml	1970-01-01 00:00:00 +0000
+++ bundles/lxd/nova-liberty.yaml	2016-02-19 16:56:07 +0000
@@ -0,0 +1,13 @@
+repositories:
+  - {name: requirements,
+     repository: 'git://github.com/openstack/requirements',
+     branch: stable/liberty}
+  - {name: neutron,
+     repository: 'git://github.com/openstack/neutron',
+     branch: stable/liberty}
+  - {name: nova,
+     repository: 'git://github.com/openstack/nova',
+     branch: stable/liberty}
+directory: /mnt/openstack-git
+http_proxy: http://squid.internal:3128
+https_proxy: http://squid.internal:3128

=== added file 'bundles/lxd/nova-master.yaml'
--- bundles/lxd/nova-master.yaml	1970-01-01 00:00:00 +0000
+++ bundles/lxd/nova-master.yaml	2016-02-19 16:56:07 +0000
@@ -0,0 +1,21 @@
+# Update this file to point to master when Xenial
+# is available
+repositories:
+  - {name: requirements,
+     repository: 'git://github.com/zulcss/requirements',
+     branch: master}
+  - {name: neutron,
+     repository: 'git://github.com/openstack/neutron',
+     branch: 8.0.0.0b2}
+  - {name: nova-lxd,
+     repository: 'git://github.com/lxc/nova-lxd',
+     branch: master}
+  - {name: pylxd,
+     repository: 'git://github.com/lxc/pylxd',
+     branch: master}
+  - {name: nova,
+     repository: 'git://github.com/openstack/nova',
+     branch: 13.0.0.0b2}
+directory: /mnt/openstack-git
+http_proxy: http://squid.internal:3128
+https_proxy: http://squid.internal:3128