4 files changed, 7 insertions, 87 deletions
diff --git a/ci/odl/juju-deployer/odl.yaml b/ci/odl/juju-deployer/odl.yaml
deleted file mode 100644
index f5e6bd73..00000000
--- a/ci/odl/juju-deployer/odl.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-openstack:
-  services:
-    mysql:
-      constraints: mem=1G
-      options:
-        dataset-size: 50%
-        max-connections: 1000
-    rabbitmq-server:
-      constraints: mem=1G
-    keystone:
-      branch: lp:~openstack-charmers/charms/trusty/keystone/next
-      constraints: mem=1G
-    openstack-dashboard:
-      branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
-      constraints: mem=1G
-    nova-compute:
-      branch: lp:~sdn-charmers/charms/trusty/nova-compute/odl
-      constraints: mem=4G root-disk=20G
-    nova-cloud-controller:
-      branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
-      constraints: mem=1G
-      options:
-        network-manager: Neutron
-    neutron-api:
-      branch: lp:~sdn-charmers/charms/trusty/neutron-api/odl
-      constraints: mem=1G
-    neutron-gateway:
-      branch: lp:~sdn-charmers/charms/trusty/quantum-gateway/odl
-      constraints: mem=1G
-    glance:
-      branch: lp:~openstack-charmers/charms/trusty/glance/next
-      constraints: mem=1G
-  relations:
-    - [ keystone, mysql ]
-    - [ nova-cloud-controller, mysql ]
-    - [ nova-cloud-controller, rabbitmq-server ]
-    - [ nova-cloud-controller, glance ]
-    - [ nova-cloud-controller, keystone ]
-    - [ neutron-api, mysql ]
-    - [ neutron-api, rabbitmq-server ]
-    - [ neutron-api, keystone ]
-    - [ neutron-api, nova-cloud-controller ]
-    - [ neutron-gateway, mysql ]
-    - [ "neutron-gateway:amqp", "rabbitmq-server:amqp" ]
-    - [ neutron-gateway, nova-cloud-controller ]
-    - [ neutron-gateway, neutron-api ]
-    - [ "nova-compute:shared-db", "mysql:shared-db" ]
-    - [ "nova-compute:amqp", "rabbitmq-server:amqp" ]
-    - [ nova-compute, glance ]
-    - [ nova-compute, nova-cloud-controller ]
-    - [ glance, mysql ]
-    - [ glance, keystone ]
-    - [ openstack-dashboard, keystone ]
-odl:
-  inherits: openstack
-  services:
-    odl-controller:
-      branch: lp:~sdn-charmers/charms/trusty/odl-controller/trunk
-      constraints: mem=4G
-    neutron-odl:
-      branch: lp:~sdn-charmers/charms/trusty/neutron-odl/trunk
-  relations:
-    - [ neutron-api, odl-controller ]
-    - [ neutron-gateway, odl-controller ]
-    - [ nova-compute, neutron-odl ]
-    - [ neutron-odl, odl-controller ]
-trusty-icehouse-odl:
-  inherits: odl
-  series: trusty
-  services:
-    mysql:
-      charm: cs:trusty/mysql
-    rabbitmq-server:
-      charm: cs:trusty/rabbitmq-server
-  overrides:
-    instance-mtu: 1400
-    neutron-plugin: odl
-    neutron-security-groups: True
-    plugin: odl
-    quantum-security-groups: "yes"
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index 50245bcf..e5fb863f 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -5,7 +5,7 @@ openstack-phase1:
     nodes-api:
       branch: "lp:charms/trusty/ubuntu"
       num_units: 3
-      constraints: tags=api
+      constraints: tags=control
     nodes-compute:
       branch: "lp:charms/trusty/ubuntu"
       num_units: 1
diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml
index a5d1f08e..73946c13 100644
--- a/ci/odl/juju-deployer/ovs-odl-tip.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml
@@ -3,7 +3,7 @@ openstack-services:
     ubuntu:
       branch: "lp:charms/trusty/ubuntu"
       num_utils: 1
-      constraints: tags=physical
+      constraints: tags=control
     neutron-gateway:
       branch: lp:~sdn-charmers/charms/trusty/neutron-gateway/ovs-odl
       options:
@@ -12,8 +12,8 @@ openstack-services:
       to: ubuntu=0
     nova-compute:
       branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
-      num_units: 2
-      constraints: tags=physical
+      num_units: 1
+      constraints: tags=compute
       options:
         enable-live-migration: False
         manage-neutron-plugin-legacy-mode: False
diff --git a/ci/odl/juju-deployer/ovs-odl.yaml b/ci/odl/juju-deployer/ovs-odl.yaml
index ec956fe7..b188a587 100644
--- a/ci/odl/juju-deployer/ovs-odl.yaml
+++ b/ci/odl/juju-deployer/ovs-odl.yaml
@@ -4,7 +4,7 @@ openstack-services:
     ubuntu:
       branch: "lp:charms/trusty/ubuntu"
       num_utils: 1
-      constraints: tags=physical
+      constraints: tags=control
     neutron-gateway:
       branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next
       #constraints: tags=neutron
@@ -15,8 +15,8 @@ openstack-services:
       to: ubuntu=0
     nova-compute:
       branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
-      num_units: 2
-      constraints: tags=physical
+      num_units: 1
+      constraints: tags=compute
       options:
         enable-live-migration: False
         manage-neutron-plugin-legacy-mode: False