diff options
Diffstat (limited to 'ci/onos/juju-deployer/ovs-onos-tip.yaml')
| -rw-r--r-- | ci/onos/juju-deployer/ovs-onos-tip.yaml | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/ci/onos/juju-deployer/ovs-onos-tip.yaml b/ci/onos/juju-deployer/ovs-onos-tip.yaml index e574bcc6..f1d10687 100644 --- a/ci/onos/juju-deployer/ovs-onos-tip.yaml +++ b/ci/onos/juju-deployer/ovs-onos-tip.yaml @@ -1,8 +1,6 @@ # vim: set ts=2 et: trusty-mitaka-nodes: inherits: openstack-phase1 - overrides: - series: trusty trusty-mitaka: inherits: openstack-phase2 @@ -15,13 +13,11 @@ trusty-mitaka: region: Canonical #source: "cloud:trusty-mitaka" openstack-origin: "cloud:trusty-mitaka" - series: trusty ceph-osd-replication-count: 2 admin-role: admin keystone-admin-role: admin openstack-phase1: - series: trusty services: nodes: charm: "cs:trusty/ubuntu" @@ -159,7 +155,6 @@ openstack-phase2: options: fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== - osd-devices: "" monitor-count: 2 # osd-reformat: 'no' # ceph-cluster-network: 192.168.0.0/24 @@ -274,6 +269,6 @@ openstack-phase2: congress: charm: local:trusty/congress options: - source-branch: stable/mitaka + #source-branch: stable/mitaka to: - "lxc:nodes=0" |