diff options
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/maas/intel/pod5/deployment.yaml | 28 | ||||
| -rw-r--r-- | ci/nosdn/juju-deployer/ovs-ha.yaml | 15 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-ha.yaml | 57 | ||||
| -rw-r--r-- | ci/onos/juju-deployer/onos-ha.yaml | 58 | ||||
| -rw-r--r-- | ci/opencontrail/juju-deployer/contrail-ha.yaml | 55 |
5 files changed, 123 insertions, 90 deletions
diff --git a/ci/maas/intel/pod5/deployment.yaml b/ci/maas/intel/pod5/deployment.yaml index de5c29c0..dcfa3a38 100755 --- a/ci/maas/intel/pod5/deployment.yaml +++ b/ci/maas/intel/pod5/deployment.yaml @@ -142,14 +142,23 @@ demo-maas: # Defines the physical nodes which are added to the MAAS cluster # controller upon startup of the node. nodes: + - name: node6-control + tags: control + architecture: amd64/generic + mac_addresses: + - "00:15:17:ac:3b:b4" + power: + type: ipmi + address: 10.4.7.6 + user: root + pass: root + driver: LAN_2_0 + - name: node5-compute tags: compute architecture: amd64/generic mac_addresses: - "00:1e:67:e0:0a:4a" - - "00:1e:67:e0:0a:4b" - - "00:1e:67:d0:9a:10" - - "00:1e:67:d0:9a:11" power: type: ipmi address: 10.4.7.5 @@ -160,14 +169,11 @@ demo-maas: # mac_address: "38:63:bb:43:b8:9c" # requested_address: 192.168.122.5 - - name: node4-control - tags: control + - name: node4-compute + tags: compute architecture: amd64/generic mac_addresses: - "00:1e:67:e0:08:b0" - - "00:1e:67:e0:08:b1" - - "00:1e:67:d0:99:ee" - - "00:1e:67:d0:99:ef" power: type: ipmi address: 10.4.7.4 @@ -183,9 +189,6 @@ demo-maas: architecture: amd64/generic mac_addresses: - "00:1e:67:e0:08:7e" - - "00:1e:67:e0:08:7f" - - "00:1e:67:c2:23:d8" - - "00:1e:67:c2:23:d9" power: type: ipmi address: 10.4.7.3 @@ -201,9 +204,6 @@ demo-maas: architecture: amd64/generic mac_addresses: - "00:1e:67:cf:b8:92" - - "00:1e:67:cf:b8:93" - - "00:1e:67:d0:9b:0c" - - "00:1e:67:d0:9b:0d" power: type: ipmi address: 10.4.7.2 diff --git a/ci/nosdn/juju-deployer/ovs-ha.yaml b/ci/nosdn/juju-deployer/ovs-ha.yaml index 357349f1..bb910240 100644 --- a/ci/nosdn/juju-deployer/ovs-ha.yaml +++ b/ci/nosdn/juju-deployer/ovs-ha.yaml @@ -8,7 +8,7 @@ openstack-phase1: constraints: tags=control nodes-compute: charm: "local:trusty/ubuntu-nodes-compute" - num_units: 1 + num_units: 2 constraints: tags=compute "ntp": charm: "cs:trusty/ntp" @@ -31,7 +31,7 @@ openstack-phase2: charm: cs:trusty/ceilometer-agent ceph: charm: cs:trusty/ceph - num_units: 1 + num_units: 2 options: monitor-count: 1 fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 @@ -42,6 +42,7 @@ openstack-phase2: # ceph-public-network: 192.168.0.0/24 to: - "nodes-compute=0" + - "nodes-compute=1" ceph-osd: charm: cs:trusty/ceph-osd num_units: 3 @@ -150,7 +151,7 @@ openstack-phase2: - "lxc:nodes-api=2" nova-compute: charm: cs:trusty/nova-compute - num_units: 1 + num_units: 2 options: enable-live-migration: true enable-resize: true @@ -158,7 +159,7 @@ openstack-phase2: migration-auth-type: ssh to: - "nodes-compute=0" -# - "nodes-compute=1" + - "nodes-compute=1" # - "nodes-api=0" # - "nodes-api=1" # - "nodes-api=2" @@ -324,7 +325,7 @@ trusty-liberty: source: "cloud:trusty-liberty" "openstack-origin": "cloud:trusty-liberty" series: trusty - ceph-osd-replication-count: 1 + ceph-osd-replication-count: 2 trusty-kilo-nodes: inherits: openstack-phase1 @@ -340,7 +341,7 @@ trusty-kilo: source: "cloud:trusty-kilo" "openstack-origin": "cloud:trusty-kilo" series: trusty - ceph-osd-replication-count: 1 + ceph-osd-replication-count: 2 trusty-juno-nodes: inherits: openstack-phase1 @@ -356,5 +357,5 @@ trusty-juno: source: "cloud:trusty-juno" "openstack-origin": "cloud:trusty-juno" series: trusty - ceph-osd-replication-count: 1 + ceph-osd-replication-count: 2 diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml index c2764678..d8ac0f80 100644 --- a/ci/odl/juju-deployer/ovs-odl-ha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -8,7 +8,7 @@ openstack-phase1: constraints: tags=control nodes-compute: charm: "local:trusty/ubuntu-nodes-compute" - num_units: 1 + num_units: 2 constraints: tags=compute "ntp": charm: "cs:trusty/ntp" @@ -86,7 +86,7 @@ openstack-phase2: - "lxc:nodes-api=0" ceph: charm: cs:trusty/ceph - num_units: 1 + num_units: 2 options: fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== @@ -97,22 +97,26 @@ openstack-phase2: # ceph-public-network: 192.168.0.0/24 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" + - "nodes-compute=1" + ceph-osd: + charm: cs:trusty/ceph-osd + num_units: 3 + options: + osd-devices: /srv + osd-reformat: 'yes' + to: + - "nodes-api=0" + - "nodes-api=1" + - "nodes-api=2" + ceph-radosgw: + charm: cs:trusty/ceph-radosgw + num_units: 3 + options: + use-embedded-webserver: true + to: + - "lxc:nodes-api=0" + - "lxc:nodes-api=1" + - "lxc:nodes-api=2" cinder: charm: cs:trusty/cinder num_units: 3 @@ -158,13 +162,13 @@ openstack-phase2: - "lxc:nodes-api=2" "nova-compute": branch: lp:~openstack-charmers/charms/trusty/nova-compute/next - num_units: 1 + num_units: 2 options: "enable-live-migration": False "manage-neutron-plugin-legacy-mode": False to: - "nodes-compute=0" -# - "nodes-compute=1" + - "nodes-compute=1" # - "nodes-api=0" # - "nodes-api=1" # - "nodes-api=2" @@ -324,6 +328,13 @@ 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: @@ -339,7 +350,7 @@ trusty-liberty: source: "cloud:trusty-liberty" "openstack-origin": "cloud:trusty-liberty" series: trusty - ceph-osd-replication-count: 1 + ceph-osd-replication-count: 2 trusty-kilo-nodes: inherits: openstack-phase1 @@ -356,7 +367,7 @@ trusty-kilo: source: "cloud:trusty-kilo" "openstack-origin": "cloud:trusty-kilo" series: trusty - ceph-osd-replication-count: 1 + ceph-osd-replication-count: 2 trusty-juno-nodes: @@ -374,6 +385,6 @@ trusty-juno: source: "cloud:trusty-juno" "openstack-origin": "cloud:trusty-juno" series: trusty - ceph-osd-replication-count: 1 + ceph-osd-replication-count: 2 diff --git a/ci/onos/juju-deployer/onos-ha.yaml b/ci/onos/juju-deployer/onos-ha.yaml index 5b3d7954..ceaaa175 100644 --- a/ci/onos/juju-deployer/onos-ha.yaml +++ b/ci/onos/juju-deployer/onos-ha.yaml @@ -8,7 +8,7 @@ openstack-phase1: constraints: tags=control nodes-compute: charm: "local:trusty/ubuntu-nodes-compute" - num_units: 1 + num_units: 2 constraints: tags=compute "ntp": charm: "cs:trusty/ntp" @@ -86,7 +86,7 @@ openstack-phase2: - "lxc:nodes-api=0" ceph: charm: cs:trusty/ceph - num_units: 1 + num_units: 2 options: fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== @@ -97,22 +97,27 @@ openstack-phase2: # ceph-public-network: 192.168.0.0/24 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" + - "nodes-compute=1" + ceph-osd: + charm: cs:trusty/ceph-osd + num_units: 3 + options: + osd-devices: /srv + osd-reformat: 'yes' + to: + - "nodes-api=0" + - "nodes-api=1" + - "nodes-api=2" + ceph-radosgw: + charm: cs:trusty/ceph-radosgw + num_units: 3 + options: + use-embedded-webserver: true + to: + - "lxc:nodes-api=0" + - "lxc:nodes-api=1" + - "lxc:nodes-api=2" + cinder: charm: cs:trusty/cinder num_units: 3 @@ -158,13 +163,13 @@ openstack-phase2: - "lxc:nodes-api=2" "nova-compute": branch: lp:~openstack-charmers/charms/trusty/nova-compute/next - num_units: 1 + num_units: 2 options: "enable-live-migration": False "manage-neutron-plugin-legacy-mode": False to: - "nodes-compute=0" -# - "nodes-compute=1" + - "nodes-compute=1" # - "nodes-api=0" # - "nodes-api=1" # - "nodes-api=2" @@ -318,6 +323,13 @@ 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: @@ -333,7 +345,7 @@ trusty-liberty: source: "cloud:trusty-liberty" "openstack-origin": "cloud:trusty-liberty" series: trusty - ceph-osd-replication-count: 1 + ceph-osd-replication-count: 2 trusty-kilo-nodes: inherits: openstack-phase1 @@ -350,7 +362,7 @@ trusty-kilo: source: "cloud:trusty-kilo" "openstack-origin": "cloud:trusty-kilo" series: trusty - ceph-osd-replication-count: 1 + ceph-osd-replication-count: 2 trusty-juno-nodes: @@ -368,6 +380,6 @@ trusty-juno: source: "cloud:trusty-juno" "openstack-origin": "cloud:trusty-juno" series: trusty - ceph-osd-replication-count: 1 + ceph-osd-replication-count: 2 diff --git a/ci/opencontrail/juju-deployer/contrail-ha.yaml b/ci/opencontrail/juju-deployer/contrail-ha.yaml index 686ba847..3183c614 100644 --- a/ci/opencontrail/juju-deployer/contrail-ha.yaml +++ b/ci/opencontrail/juju-deployer/contrail-ha.yaml @@ -8,7 +8,7 @@ openstack-phase1: constraints: tags=control nodes-compute: charm: "local:trusty/ubuntu-nodes-compute" - num_units: 1 + num_units: 2 constraints: tags=compute "ntp": charm: "cs:trusty/ntp" @@ -103,7 +103,7 @@ openstack-phase2: - "lxc:nodes-api=0" ceph: charm: cs:trusty/ceph - num_units: 1 + num_units: 2 options: fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== @@ -114,22 +114,27 @@ openstack-phase2: # ceph-public-network: 192.168.0.0/24 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" + - "nodes-compute=1" + ceph-osd: + charm: cs:trusty/ceph-osd + num_units: 3 + options: + osd-devices: /srv + osd-reformat: 'yes' + to: + - "nodes-api=0" + - "nodes-api=1" + - "nodes-api=2" + ceph-radosgw: + charm: cs:trusty/ceph-radosgw + num_units: 3 + options: + use-embedded-webserver: true + to: + - "lxc:nodes-api=0" + - "lxc:nodes-api=1" + - "lxc:nodes-api=2" + cinder: charm: cs:trusty/cinder num_units: 3 @@ -174,13 +179,13 @@ openstack-phase2: - "lxc:nodes-api=2" "nova-compute": branch: lp:~openstack-charmers/charms/trusty/nova-compute/next - num_units: 1 + num_units: 2 options: "enable-live-migration": False "manage-neutron-plugin-legacy-mode": False to: - "nodes-compute=0" -# - "nodes-compute=1" + - "nodes-compute=1" # - "nodes-api=0" # - "nodes-api=1" # - "nodes-api=2" @@ -259,6 +264,10 @@ openstack-phase2: - [ "cinder:shared-db", "percona-cluster: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: @@ -347,7 +356,7 @@ trusty-liberty: region: Canonical openstack-origin: cloud:trusty-liberty source: "cloud:trusty-liberty" - ceph-osd-replication-count: 1 + ceph-osd-replication-count: 2 trusty-kilo-nodes: inherits: openstack-phase1 @@ -365,7 +374,7 @@ trusty-kilo: region: Canonical openstack-origin: cloud:trusty-kilo source: "cloud:trusty-kilo" - ceph-osd-replication-count: 1 + ceph-osd-replication-count: 2 trusty-juno-nodes: inherits: openstack-phase1 @@ -382,6 +391,6 @@ trusty-juno: region: Canonical openstack-origin: cloud:trusty-juno source: "cloud:trusty-juno" - ceph-osd-replication-count: 1 + ceph-osd-replication-count: 2 |