diff options
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/02-maasdeploy.sh | 7 | ||||
| -rwxr-xr-x | ci/deploy.sh | 7 | ||||
| -rw-r--r-- | ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml | 16 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-nonha.yaml | 16 |
4 files changed, 25 insertions, 21 deletions
diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh index 5f49daf1..ddc7f2e0 100755 --- a/ci/02-maasdeploy.sh +++ b/ci/02-maasdeploy.sh @@ -157,11 +157,15 @@ if [ "$virtinstall" -eq 1 ]; then 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 + 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 + node1controlmac=`grep "mac address" node1-control | head -1 | cut -d "'" -f 2` node2computemac=`grep "mac address" node2-compute | head -1 | cut -d "'" -f 2` + node5computemac=`grep "mac address" node5-compute | head -1 | cut -d "'" -f 2` sudo virsh -c qemu:///system define --file node1-control sudo virsh -c qemu:///system define --file node2-compute + sudo virsh -c qemu:///system define --file node5-compute maas maas tags new name='control' maas maas tags new name='compute' @@ -174,6 +178,9 @@ if [ "$virtinstall" -eq 1 ]; then maas maas tag update-nodes compute add=$computenodeid + computenodeid=`maas maas nodes new autodetect_nodegroup='yes' name='node5-compute' tags='compute' hostname='node5-compute' power_type='virsh' mac_addresses=$node5computemac power_parameters_power_address='qemu+ssh://'$USER'@192.168.122.1/system' architecture='amd64/generic' power_parameters_power_id='node5-compute' | grep system_id | cut -d '"' -f 4 ` + + maas maas tag update-nodes compute add=$computenodeid fi # Enable vlan interfaces with maas diff --git a/ci/deploy.sh b/ci/deploy.sh index 1f418797..6e82d086 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -76,15 +76,11 @@ 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 --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` - node5computemac=`grep "mac address" node5-compute | head -1 | cut -d "'" -f 2` sudo virsh -c qemu:///system define --file node3-control sudo virsh -c qemu:///system define --file node4-control - sudo virsh -c qemu:///system define --file node5-compute controlnodeid=`maas maas nodes new autodetect_nodegroup='yes' name='node3-control' tags='control' hostname='node3-control' power_type='virsh' mac_addresses=$node3controlmac power_parameters_power_address='qemu+ssh://'$USER'@192.168.122.1/system' architecture='amd64/generic' power_parameters_power_id='node3-control' | grep system_id | cut -d '"' -f 4 ` @@ -94,9 +90,6 @@ createresource() { maas maas tag update-nodes control add=$controlnodeid - computenodeid=`maas maas nodes new autodetect_nodegroup='yes' name='node5-compute' tags='compute' hostname='node5-compute' power_type='virsh' mac_addresses=$node5computemac power_parameters_power_address='qemu+ssh://'$USER'@192.168.122.1/system' architecture='amd64/generic' power_parameters_power_id='node5-compute' | grep system_id | cut -d '"' -f 4 ` - - maas maas tag update-nodes compute add=$computenodeid fi } diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml index d64d0a4f..497ff075 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml @@ -8,7 +8,7 @@ openstack-phase1: constraints: tags=control nodes-compute: charm: "cs:trusty/ubuntu" - num_units: 1 + num_units: 2 constraints: tags=compute ntp: charm: "cs:trusty/ntp" @@ -29,9 +29,9 @@ openstack-phase2: branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next" ceph: branch: "lp:~openstack-charmers/charms/trusty/ceph/next" - num_units: 1 + num_units: 2 options: - monitor-count: 1 + monitor-count: 2 fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== osd-devices: "" @@ -40,14 +40,16 @@ openstack-phase2: # ceph-public-network: 192.168.0.0/24 to: - "lxc:nodes-api=0" + - "lxc:nodes-api=0" 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-compute=0" + - "nodes-compute=1" ceph-radosgw: branch: "lp:~openstack-charmers/charms/trusty/ceph-radosgw/next" num_units: 1 @@ -267,7 +269,7 @@ trusty-liberty: source: "cloud:trusty-liberty" openstack-origin: "cloud:trusty-liberty" series: trusty - ceph-osd-replication-count: 1 + ceph-osd-replication-count: 2 admin-role: admin keystone-admin-role: admin @@ -289,7 +291,7 @@ trusty-kilo: source: "cloud:trusty-kilo" openstack-origin: "cloud:trusty-kilo" series: trusty - ceph-osd-replication-count: 1 + ceph-osd-replication-count: 2 admin-role: admin keystone-admin-role: admin @@ -311,7 +313,7 @@ trusty-juno: source: "cloud:trusty-juno" openstack-origin: "cloud:trusty-juno" series: trusty - ceph-osd-replication-count: 1 + ceph-osd-replication-count: 2 admin-role: admin keystone-admin-role: admin diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml index 97ebf598..ee090b0d 100644 --- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml @@ -8,7 +8,7 @@ openstack-phase1: constraints: tags=control nodes-compute: charm: "cs:trusty/ubuntu" - num_units: 1 + num_units: 2 constraints: tags=compute ntp: charm: "cs:trusty/ntp" @@ -46,25 +46,27 @@ openstack-phase2: - "lxc:nodes-api=0" ceph: branch: "lp:~openstack-charmers/charms/trusty/ceph/next" - num_units: 1 + num_units: 2 options: fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== osd-devices: "" - monitor-count: 1 + monitor-count: 2 # osd-reformat: 'no' # ceph-cluster-network: 192.168.0.0/24 # ceph-public-network: 192.168.0.0/24 to: - "lxc:nodes-api=0" + - "lxc:nodes-api=0" 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-compute=0" + - "nodes-compute=1" ceph-radosgw: branch: "lp:~openstack-charmers/charms/trusty/ceph-radosgw/next" num_units: 1 @@ -280,7 +282,7 @@ trusty-liberty: source: "cloud:trusty-liberty" openstack-origin: "cloud:trusty-liberty" series: trusty - ceph-osd-replication-count: 1 + ceph-osd-replication-count: 2 admin-role: admin keystone-admin-role: admin @@ -302,7 +304,7 @@ trusty-kilo: source: "cloud:trusty-kilo" openstack-origin: "cloud:trusty-kilo" series: trusty - ceph-osd-replication-count: 1 + ceph-osd-replication-count: 2 admin-role: admin keystone-admin-role: admin @@ -324,7 +326,7 @@ trusty-juno: source: "cloud:trusty-juno" openstack-origin: "cloud:trusty-juno" series: trusty - ceph-osd-replication-count: 1 + ceph-osd-replication-count: 2 admin-role: admin keystone-admin-role: admin |