summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ci/onos/juju-deployer/ovs-onos-ha.yaml21
-rw-r--r--ci/onos/juju-deployer/ovs-onos-nonha.yaml44
-rw-r--r--ci/onos/juju-deployer/ovs-onos-tip.yaml44
-rw-r--r--ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml21
-rw-r--r--ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml41
-rw-r--r--ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml42
6 files changed, 122 insertions, 91 deletions
diff --git a/ci/onos/juju-deployer/ovs-onos-ha.yaml b/ci/onos/juju-deployer/ovs-onos-ha.yaml
index 0e9373b7..56304ac3 100644
--- a/ci/onos/juju-deployer/ovs-onos-ha.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-ha.yaml
@@ -86,26 +86,28 @@ openstack-phase2:
- "lxc:nodes-api=0"
ceph:
branch: "lp:~openstack-charmers/charms/trusty/ceph/next"
- num_units: 2
+ num_units: 3
options:
fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
- osd-devices: /srv
- monitor-count: 1
- osd-reformat: 'no'
+ osd-devices: ""
+ monitor-count: 3
+# osd-reformat: 'no'
# ceph-cluster-network: 192.168.0.0/24
# ceph-public-network: 192.168.0.0/24
to:
- - "nodes-compute=0"
- - "nodes-compute=1"
+ - "lxc:nodes-api=2"
+ - "lxc:nodes-api=0"
+ - "lxc:nodes-api=1"
ceph-osd:
branch: "lp:~openstack-charmers/charms/trusty/ceph-osd/next"
- num_units: 1
+ num_units: 2
options:
osd-devices: /srv
osd-reformat: 'yes'
to:
- - "nodes-api=0"
+ - "nodes-compute=0"
+ - "nodes-compute=1"
ceph-radosgw:
branch: "lp:~openstack-charmers/charms/trusty/ceph-radosgw/next"
num_units: 3
@@ -344,6 +346,7 @@ trusty-liberty:
overrides:
cluster_count: 3
#os-data-network: 10.4.8.0/21
+ #ceph-cluster-network: 10.4.0.0/21
#prefer-ipv6: true
region: Canonical
source: "cloud:trusty-liberty"
@@ -363,6 +366,7 @@ trusty-kilo:
overrides:
cluster_count: 3
#os-data-network: 10.4.8.0/21
+ #ceph-cluster-network: 10.4.0.0/21
#prefer-ipv6: true
region: Canonical
source: "cloud:trusty-kilo"
@@ -382,6 +386,7 @@ trusty-juno:
overrides:
cluster_count: 3
#os-data-network: 10.4.8.0/21
+ #ceph-cluster-network: 10.4.0.0/21
#prefer-ipv6: true
region: Canonical
source: "cloud:trusty-juno"
diff --git a/ci/onos/juju-deployer/ovs-onos-nonha.yaml b/ci/onos/juju-deployer/ovs-onos-nonha.yaml
index 32055774..e2a7e3b0 100644
--- a/ci/onos/juju-deployer/ovs-onos-nonha.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-nonha.yaml
@@ -50,29 +50,28 @@ openstack-phase2:
options:
fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
- osd-devices: /srv
+ osd-devices: ""
monitor-count: 1
- osd-reformat: 'no'
+# osd-reformat: 'no'
# ceph-cluster-network: 192.168.0.0/24
# ceph-public-network: 192.168.0.0/24
to:
+ - "lxc:nodes-api=0"
+ ceph-osd:
+ charm: cs:trusty/ceph-osd
+ num_units: 1
+ options:
+ osd-devices: /srv
+ osd-reformat: 'yes'
+ to:
- "nodes-compute=0"
-# - "nodes-compute=1"
-# ceph-osd:
-# charm: cs:trusty/ceph-osd
-# num_units: 1
-# options:
-# osd-devices: /dev/sdb
-# osd-reformat: 'yes'
-# to:
-# - "lxc:nodes-api=0"
-# ceph-radosgw:
-# charm: cs:trusty/ceph-radosgw
-# num_units: 1
-# options:
-# use-embedded-webserver: true
-# to:
-# - "lxc:nodes-api=0"
+ ceph-radosgw:
+ charm: cs:trusty/ceph-radosgw
+ num_units: 1
+ options:
+ use-embedded-webserver: true
+ to:
+ - "lxc:nodes-api=0"
cinder:
branch: "lp:~openstack-charmers/charms/trusty/cinder/next"
num_units: 1
@@ -249,6 +248,12 @@ openstack-phase2:
- "cinder-ceph:ceph"
- - "ceph:client"
- "glance:ceph"
+ - - "ceph-osd:mon"
+ - "ceph:osd"
+ - - "ceph-radosgw:mon"
+ - "ceph:radosgw"
+ - - "ceph-radosgw:identity-service"
+ - "keystone:identity-service"
trusty-liberty-nodes:
inherits: openstack-phase1
overrides:
@@ -258,6 +263,7 @@ trusty-liberty:
inherits: openstack-phase2
overrides:
#os-data-network: 10.4.8.0/21
+ #ceph-cluster-network: 10.4.0.0/21
#prefer-ipv6: true
region: Canonical
source: "cloud:trusty-liberty"
@@ -276,6 +282,7 @@ trusty-kilo:
inherits: openstack-phase2
overrides:
#os-data-network: 10.4.8.0/21
+ #ceph-cluster-network: 10.4.0.0/21
#prefer-ipv6: true
region: Canonical
source: "cloud:trusty-kilo"
@@ -294,6 +301,7 @@ trusty-juno:
inherits: openstack-phase2
overrides:
#os-data-network: 10.4.8.0/21
+ #ceph-cluster-network: 10.4.0.0/21
#prefer-ipv6: true
region: Canonical
source: "cloud:trusty-juno"
diff --git a/ci/onos/juju-deployer/ovs-onos-tip.yaml b/ci/onos/juju-deployer/ovs-onos-tip.yaml
index c1164ceb..1e173d18 100644
--- a/ci/onos/juju-deployer/ovs-onos-tip.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-tip.yaml
@@ -50,30 +50,28 @@ openstack-phase2:
options:
fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
- osd-devices: /srv
+ osd-devices: ""
monitor-count: 1
- osd-reformat: 'no'
+# osd-reformat: 'no'
# ceph-cluster-network: 192.168.0.0/24
# ceph-public-network: 192.168.0.0/24
to:
+ - "lxc:nodes-api=0"
+ ceph-osd:
+ charm: cs:trusty/ceph-osd
+ num_units: 1
+ options:
+ osd-devices: /srv
+ osd-reformat: 'yes'
+ to:
- "nodes-compute=0"
-# - "nodes-compute=1"
-# ceph-osd:
-# charm: cs:trusty/ceph-osd
-# num_units: 1
-# options:
-# osd-devices: /dev/sdb
-# osd-reformat: 'yes'
-# to:
-# - "lxc:nodes-api=0"
-# ceph-radosgw:
-# charm: cs:trusty/ceph-radosgw
-# num_units: 1
-# options:
-# use-embedded-webserver: true
-# to:
-
-# - "lxc:nodes-api=0"
+ ceph-radosgw:
+ charm: cs:trusty/ceph-radosgw
+ num_units: 1
+ options:
+ use-embedded-webserver: true
+ to:
+ - "lxc:nodes-api=0"
cinder:
branch: "lp:~openstack-charmers/charms/trusty/cinder/next"
num_units: 1
@@ -251,6 +249,12 @@ openstack-phase2:
- "cinder-ceph:ceph"
- - "ceph:client"
- "glance:ceph"
+ - - "ceph-osd:mon"
+ - "ceph:osd"
+ - - "ceph-radosgw:mon"
+ - "ceph:radosgw"
+ - - "ceph-radosgw:identity-service"
+ - "keystone:identity-service"
trusty-liberty-nodes:
inherits: openstack-phase1
overrides:
@@ -260,6 +264,7 @@ trusty-liberty:
inherits: openstack-phase2
overrides:
#os-data-network: 10.4.8.0/21
+ #ceph-cluster-network: 10.4.0.0/21
#prefer-ipv6: true
region: Canonical
source: "cloud:trusty-liberty"
@@ -281,6 +286,7 @@ trusty-kilo:
overrides:
region: Canonical
#os-data-network: 10.4.8.0/21
+ #ceph-cluster-network: 10.4.0.0/21
#prefer-ipv6: true
openstack-origin: cloud:trusty-kilo
source: cloud:trusty-kilo
diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
index b6996d7f..9b26389a 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
@@ -103,28 +103,28 @@ openstack-phase2:
- "lxc:nodes-api=0"
ceph:
charm: cs:trusty/ceph
- num_units: 2
+ num_units: 3
options:
fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
- osd-devices: /srv
- monitor-count: 1
+ osd-devices: ""
+ monitor-count: 3
osd-reformat: 'no'
# ceph-cluster-network: 192.168.0.0/24
# ceph-public-network: 192.168.0.0/24
to:
- - "nodes-compute=0"
- - "nodes-compute=1"
+ - "lxc:nodes-api=2"
+ - "lxc:nodes-api=0"
+ - "lxc:nodes-api=1"
ceph-osd:
charm: cs:trusty/ceph-osd
- num_units: 3
+ num_units: 2
options:
osd-devices: /srv
osd-reformat: 'yes'
to:
- - "nodes-api=0"
- - "nodes-api=1"
- - "nodes-api=2"
+ - "nodes-compute=0"
+ - "nodes-compute=1"
ceph-radosgw:
charm: cs:trusty/ceph-radosgw
num_units: 1
@@ -356,6 +356,7 @@ trusty-liberty:
overrides:
series: trusty
#os-data-network: 10.4.8.0/21
+ #ceph-cluster-network: 10.4.0.0/21
#prefer-ipv6: true
region: Canonical
openstack-origin: cloud:trusty-liberty
@@ -376,6 +377,7 @@ trusty-kilo:
overrides:
series: trusty
#os-data-network: 10.4.8.0/21
+ #ceph-cluster-network: 10.4.0.0/21
#prefer-ipv6: true
region: Canonical
openstack-origin: cloud:trusty-kilo
@@ -395,6 +397,7 @@ trusty-juno:
overrides:
series: trusty
#os-data-network: 10.4.8.0/21
+ #ceph-cluster-network: 10.4.0.0/21
#prefer-ipv6: true
region: Canonical
openstack-origin: cloud:trusty-juno
diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
index 5e01c495..7fb81075 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
@@ -61,29 +61,28 @@ openstack-phase2:
options:
fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
- osd-devices: /srv
+ osd-devices: ""
monitor-count: 1
- osd-reformat: 'no'
+# osd-reformat: 'no'
# ceph-cluster-network: 192.168.0.0/24
# ceph-public-network: 192.168.0.0/24
to:
+ - "lxc:nodes-api=0"
+ ceph-osd:
+ charm: cs:trusty/ceph-osd
+ num_units: 1
+ options:
+ osd-devices: /srv
+ osd-reformat: 'yes'
+ to:
- "nodes-compute=0"
-# - "nodes-compute=1"
-# ceph-osd:
-# charm: cs:trusty/ceph-osd
-# num_units: 1
-# options:
-# osd-devices: /dev/sdb
-# osd-reformat: 'yes'
-# to:
-# - "lxc:nodes-api=0"
-# ceph-radosgw:
-# charm: cs:trusty/ceph-radosgw
-# num_units: 1
-# options:
-# use-embedded-webserver: true
-# to:
-# - "lxc:nodes-api=0"
+ ceph-radosgw:
+ charm: cs:trusty/ceph-radosgw
+ num_units: 1
+ options:
+ use-embedded-webserver: true
+ to:
+ - "lxc:nodes-api=0"
cinder:
charm: cs:trusty/cinder
num_units: 1
@@ -184,6 +183,9 @@ openstack-phase2:
- [ "cinder:shared-db", "mysql:shared-db" ]
- [ "ceph:client", "cinder-ceph:ceph" ]
- [ "ceph:client", "glance:ceph" ]
+ - [ "ceph-osd:mon", "ceph:osd" ]
+ - [ "ceph-radosgw:mon", "ceph:radosgw" ]
+ - [ "ceph-radosgw:identity-service", "keystone:identity-service"]
contrail:
inherits: openstack-phase2
services:
@@ -246,6 +248,7 @@ trusty-liberty:
overrides:
series: trusty
#os-data-network: 10.4.8.0/21
+ #ceph-cluster-network: 10.4.0.0/21
#prefer-ipv6: true
region: Canonical
openstack-origin: cloud:trusty-liberty
@@ -271,6 +274,7 @@ trusty-kilo:
overrides:
series: trusty
#os-data-network: 10.4.8.0/21
+ #ceph-cluster-network: 10.4.0.0/21
#prefer-ipv6: true
region: Canonical
openstack-origin: cloud:trusty-kilo
@@ -295,6 +299,7 @@ trusty-juno:
overrides:
series: trusty
#os-data-network: 10.4.8.0/21
+ #ceph-cluster-network: 10.4.0.0/21
#prefer-ipv6: true
region: Canonical
openstack-origin: cloud:trusty-juno
diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
index 6e1f700d..25c81b16 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
@@ -61,29 +61,28 @@ openstack-phase2:
options:
fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
- osd-devices: /srv
+ osd-devices: ""
monitor-count: 1
- osd-reformat: 'no'
+# osd-reformat: 'no'
# ceph-cluster-network: 192.168.0.0/24
# ceph-public-network: 192.168.0.0/24
to:
+ - "lxc:nodes-api=0"
+ ceph-osd:
+ charm: cs:trusty/ceph-osd
+ num_units: 1
+ options:
+ osd-devices: /srv
+ osd-reformat: 'yes'
+ to:
- "nodes-compute=0"
-# - "nodes-compute=1"
-# ceph-osd:
-# charm: cs:trusty/ceph-osd
-# num_units: 1
-# options:
-# osd-devices: /dev/sdb
-# osd-reformat: 'yes'
-# to:
-# - "lxc:nodes-api=0"
-# ceph-radosgw:
-# charm: cs:trusty/ceph-radosgw
-# num_units: 1
-# options:
-# use-embedded-webserver: true
-# to:
-# - "lxc:nodes-api=0"
+ ceph-radosgw:
+ charm: cs:trusty/ceph-radosgw
+ num_units: 1
+ options:
+ use-embedded-webserver: true
+ to:
+ - "lxc:nodes-api=0"
cinder:
charm: cs:trusty/cinder
num_units: 1
@@ -234,7 +233,9 @@ contrail:
- [ "neutron-contrail:contrail-discovery", "contrail-configuration:contrail-discovery" ]
- [ "neutron-contrail:contrail-api", "contrail-configuration:contrail-api" ]
- [ neutron-contrail, keystone ]
-
+ - [ "ceph-osd:mon", "ceph:osd" ]
+ - [ "ceph-radosgw:mon", "ceph:radosgw" ]
+ - [ "ceph-radosgw:identity-service", "keystone:identity-service" ]
trusty-liberty-nodes:
inherits: openstack-phase1
series: trusty
@@ -252,6 +253,7 @@ trusty-liberty:
overrides:
series: trusty
#os-data-network: 10.4.8.0/21
+ #ceph-cluster-network: 10.4.0.0/21
#prefer-ipv6: true
region: Canonical
openstack-origin: cloud:trusty-liberty
@@ -277,6 +279,7 @@ trusty-kilo:
overrides:
series: trusty
#os-data-network: 10.4.8.0/21
+ #ceph-cluster-network: 10.4.0.0/21
#prefer-ipv6: true
region: Canonical
openstack-origin: cloud:trusty-kilo
@@ -301,6 +304,7 @@ trusty-juno:
overrides:
series: trusty
#os-data-network: 10.4.8.0/21
+ #ceph-cluster-network: 10.4.0.0/21
#prefer-ipv6: true
region: Canonical
openstack-origin: cloud:trusty-juno