diff options
Diffstat (limited to 'ci')
-rwxr-xr-x | ci/02-maasdeploy.sh | 2 | ||||
-rwxr-xr-x | ci/deploy.sh | 2 | ||||
-rwxr-xr-x | ci/maas/intel/pod5/deployment.yaml | 28 | ||||
-rwxr-xr-x | ci/maas/intel/pod6/deployment.yaml | 39 | ||||
-rwxr-xr-x | ci/nosdn/01-deploybundle.sh | 8 | ||||
-rw-r--r-- | ci/nosdn/juju-deployer/ovs-ha.yaml | 17 | ||||
-rw-r--r-- | ci/nosdn/juju-deployer/ovs.yaml | 2 | ||||
-rwxr-xr-x | ci/odl/01-deploybundle.sh | 8 | ||||
-rw-r--r-- | ci/odl/juju-deployer/ovs-odl-ha.yaml | 59 | ||||
-rw-r--r-- | ci/onos/01-deploybundle.sh | 8 | ||||
-rw-r--r-- | ci/onos/juju-deployer/onos-ha.yaml | 60 | ||||
-rwxr-xr-x | ci/opencontrail/01-deploybundle.sh | 8 | ||||
-rw-r--r-- | ci/opencontrail/juju-deployer/contrail-ha.yaml | 57 |
13 files changed, 164 insertions, 134 deletions
diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh index c40cb726..dedd56cc 100755 --- a/ci/02-maasdeploy.sh +++ b/ci/02-maasdeploy.sh @@ -123,7 +123,7 @@ if [ "$virtinstall" -eq 1 ]; then # create two more VMs to do the deployment. sudo virt-install --connect qemu:///system --name node1-control --ram 8192 --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node1-control - sudo virt-install --connect qemu:///system --name node2-compute --ram 8192 --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node2-compute + sudo virt-install --connect qemu:///system --name node2-compute --ram 8192 --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node2-compute node1controlmac=`grep "mac address" node1-control | head -1 | cut -d "'" -f 2` node2computemac=`grep "mac address" node2-compute | head -1 | cut -d "'" -f 2` diff --git a/ci/deploy.sh b/ci/deploy.sh index 28ac1b13..70be7a8f 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -71,7 +71,7 @@ createresource() { sudo virt-install --connect qemu:///system --name node4-control --ram 8192 --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node4-control - sudo virt-install --connect qemu:///system --name node5-compute --ram 8192 --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node5-compute + sudo virt-install --connect qemu:///system --name node5-compute --ram 8192 --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node5-compute node3controlmac=`grep "mac address" node3-control | head -1 | cut -d "'" -f 2` node4controlmac=`grep "mac address" node4-control | head -1 | cut -d "'" -f 2` 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/maas/intel/pod6/deployment.yaml b/ci/maas/intel/pod6/deployment.yaml index 935ad0d8..b4b8562b 100755 --- a/ci/maas/intel/pod6/deployment.yaml +++ b/ci/maas/intel/pod6/deployment.yaml @@ -140,6 +140,21 @@ demo-maas: # Defines the physical nodes which are added to the MAAS cluster # controller upon startup of the node. nodes: + - name: node1-control + tags: control + architecture: amd64/generic + mac_addresses: + - "00:1e:67:d8:ba:45" + power: + type: ipmi + address: 10.4.7.1 + user: root + pass: root + driver: LAN_2_0 +# sticky_ip_address: +# mac_address: "38:63:bb:43:b8:9c" +# requested_address: 192.168.122.5 + - name: node2-control tags: control architecture: amd64/generic @@ -155,24 +170,6 @@ demo-maas: # mac_address: "38:63:bb:43:b8:9c" # requested_address: 192.168.122.5 -# - name: node1 -# tags: physical -# 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.2.9 -# user: root -# pass: root -# driver: LAN_2_0 -# sticky_ip_address: -# mac_address: "38:63:bb:43:b8:9c" -# requested_address: 192.168.122.5 - - name: node3-control tags: control architecture: amd64/generic @@ -188,8 +185,8 @@ 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:09:fa" @@ -231,7 +228,7 @@ demo-maas: # node virtual machine juju-bootstrap: name: bootstrap - interfaces: ['bridge=brAdm,model=virtio', 'bridge=brData,model=virtio', 'bridge=brPublic,model=virtio'] + interfaces: ['bridge=brAdm,model=virtio', 'bridge=brPublic,model=virtio'] memory: 4096 vcpus: 4 arch: amd64 diff --git a/ci/nosdn/01-deploybundle.sh b/ci/nosdn/01-deploybundle.sh index 5d5b631c..92295fe7 100755 --- a/ci/nosdn/01-deploybundle.sh +++ b/ci/nosdn/01-deploybundle.sh @@ -75,19 +75,19 @@ echo "... Deployment Started ...." case "$1" in 'nonha' ) juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes - juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2" + juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" ;; 'ha' ) juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes - juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2" + juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" ;; 'tip' ) juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes - juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2" + juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" ;; * ) juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes - juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2" + juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" ;; esac diff --git a/ci/nosdn/juju-deployer/ovs-ha.yaml b/ci/nosdn/juju-deployer/ovs-ha.yaml index 357349f1..917cfc3c 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 @@ -103,7 +104,7 @@ openstack-phase2: to: - "lxc:nodes-api=0" mysql: - charm: cs:trusty/percona-cluster + branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next" num_units: 3 options: max-connections: 20000 @@ -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/nosdn/juju-deployer/ovs.yaml b/ci/nosdn/juju-deployer/ovs.yaml index 386fbb13..4f305695 100644 --- a/ci/nosdn/juju-deployer/ovs.yaml +++ b/ci/nosdn/juju-deployer/ovs.yaml @@ -89,7 +89,7 @@ openstack-phase2: to: - "lxc:nodes-api=0" mysql: - charm: cs:trusty/percona-cluster + branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next" num_units: 1 options: max-connections: 20000 diff --git a/ci/odl/01-deploybundle.sh b/ci/odl/01-deploybundle.sh index eca968cc..7887a182 100755 --- a/ci/odl/01-deploybundle.sh +++ b/ci/odl/01-deploybundle.sh @@ -75,19 +75,19 @@ echo "... Deployment Started ...." case "$1" in 'nonha' ) juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes - juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2" + juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" ;; 'ha' ) juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes - juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2" + juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" ;; 'tip' ) juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes - juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2" + juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" ;; * ) juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes - juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2" + juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" ;; esac diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml index c2764678..6a046e38 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" @@ -21,7 +21,7 @@ openstack-phase2: inherits: openstack-phase1 services: "percona-cluster": - charm: "cs:trusty/percona-cluster" + branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next" num_units: 3 options: "dataset-size": 2G @@ -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/01-deploybundle.sh b/ci/onos/01-deploybundle.sh index bf7309d6..dbd74b45 100644 --- a/ci/onos/01-deploybundle.sh +++ b/ci/onos/01-deploybundle.sh @@ -81,19 +81,19 @@ echo "... Deployment Started ...." case "$1" in 'nonha' ) juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes - juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2" + juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" ;; 'ha' ) juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes - juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2" + juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" ;; 'tip' ) juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes - juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2" + juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" ;; * ) juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes - juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2" + juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" ;; esac diff --git a/ci/onos/juju-deployer/onos-ha.yaml b/ci/onos/juju-deployer/onos-ha.yaml index 5b3d7954..608c693b 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" @@ -21,7 +21,7 @@ openstack-phase2: inherits: openstack-phase1 services: "percona-cluster": - charm: "cs:trusty/percona-cluster" + branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next" num_units: 3 options: "dataset-size": 2G @@ -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/01-deploybundle.sh b/ci/opencontrail/01-deploybundle.sh index 19d67a60..ea8290a1 100755 --- a/ci/opencontrail/01-deploybundle.sh +++ b/ci/opencontrail/01-deploybundle.sh @@ -76,19 +76,19 @@ echo "... Deployment Started ...." case "$1" in 'nonha' ) juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes - juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2" + juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" ;; 'ha' ) juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes - juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2" + juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" ;; 'tip' ) juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes - juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2" + juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" ;; * ) juju-deployer -vW -d -c bundles.yaml trusty-"$2"-nodes - juju-deployer -vW -d -t 3600 -c bundles.yaml trusty-"$2" + juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml trusty-"$2" ;; esac diff --git a/ci/opencontrail/juju-deployer/contrail-ha.yaml b/ci/opencontrail/juju-deployer/contrail-ha.yaml index 686ba847..907fe928 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" @@ -38,7 +38,7 @@ openstack-phase2: inherits: openstack-phase1 services: "percona-cluster": - charm: "cs:trusty/percona-cluster" + branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next" num_units: 3 options: "dataset-size": 2G @@ -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 |