diff options
| -rwxr-xr-x | ci/03-maasdeploy.sh | 8 | ||||
| -rwxr-xr-x | ci/deploy.sh | 4 | ||||
| -rw-r--r-- | labconfig/cengn/pod1/labconfig.yaml | 12 |
3 files changed, 12 insertions, 12 deletions
diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh index eaccd341..0645763f 100755 --- a/ci/03-maasdeploy.sh +++ b/ci/03-maasdeploy.sh @@ -344,7 +344,7 @@ addnodes(){ power_parameters_power_address='qemu+ssh://'$USER'@'$MAAS_IP'/system' \ architecture='amd64/generic' power_parameters_power_id='bootstrap' - bootstrapid=$(maas $PROFILE machines read | jq -r 'select(.[].hostname == "bootstrap")[0].system_id') + bootstrapid=$(maas $PROFILE machines read | jq -r '.[] | select(.hostname == "bootstrap").system_id') maas $PROFILE tag update-nodes bootstrap add=$bootstrapid @@ -377,17 +377,17 @@ addnodes(){ tags='control' hostname='node1-control' power_type='virsh' mac_addresses=$node1controlmac \ power_parameters_power_address='qemu+ssh://'$USER'@'$MAAS_IP'/system' \ architecture='amd64/generic' power_parameters_power_id='node1-control' - controlnodeid=$(maas $PROFILE machines read | jq -r 'select(.[].hostname == "node1-control")[0].system_id') + controlnodeid=$(maas $PROFILE machines read | jq -r '.[] | select(.hostname == "node1-control").system_id') maas $PROFILE machines create autodetect_nodegroup='yes' name='node2-compute' \ tags='compute' hostname='node2-compute' power_type='virsh' mac_addresses=$node2computemac \ power_parameters_power_address='qemu+ssh://'$USER'@'$MAAS_IP'/system' \ architecture='amd64/generic' power_parameters_power_id='node2-compute' - compute2nodeid=$(maas $PROFILE machines read | jq -r 'select(.[].hostname == "node2-compute")[0].system_id') + compute2nodeid=$(maas $PROFILE machines read | jq -r '.[] | select(.hostname == "node2-compute").system_id') maas $PROFILE machines create autodetect_nodegroup='yes' name='node5-compute' \ tags='compute' hostname='node5-compute' power_type='virsh' mac_addresses=$node5computemac \ power_parameters_power_address='qemu+ssh://'$USER'@'$MAAS_IP'/system' \ architecture='amd64/generic' power_parameters_power_id='node5-compute' - compute5nodeid=$(maas $PROFILE machines read | jq -r 'select(.[].hostname == "node5-compute")[0].system_id') + compute5nodeid=$(maas $PROFILE machines read | jq -r '.[] | select(.hostname == "node5-compute").system_id') maas $PROFILE tag update-nodes control add=$controlnodeid || true maas $PROFILE tag update-nodes compute add=$compute2nodeid || true diff --git a/ci/deploy.sh b/ci/deploy.sh index 90463967..94ec5e8d 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -84,7 +84,7 @@ createresource() { for node in node3-control node4-control do node_id=$(maas $PROFILE machines read | \ - jq -r "select(.[].hostname == \"$node\")[0].system_id") + jq -r ".[] | select(.hostname == \"$node\").system_id") if [[ -z "$node_id" ]]; then sudo virt-install --connect qemu:///system --name $node \ --ram 8192 --cpu host --vcpus 4 \ @@ -103,7 +103,7 @@ createresource() { power_parameters_power_address="qemu+ssh://$USER@192.168.122.1/system" \ architecture='amd64/generic' power_parameters_power_id='node3-control' node_id=$(maas $PROFILE machines read | \ - jq -r "select(.[].hostname == \"$node\")[0].system_id") + jq -r ".[] | select(.hostname == \"$node\").system_id") fi if [[ -z "$node_id" ]]; then echo "Error: failed to create node $node ." diff --git a/labconfig/cengn/pod1/labconfig.yaml b/labconfig/cengn/pod1/labconfig.yaml index 6773e829..2d344670 100644 --- a/labconfig/cengn/pod1/labconfig.yaml +++ b/labconfig/cengn/pod1/labconfig.yaml @@ -11,7 +11,7 @@ lab: spaces: [admin] mac: ["00:A0:A5:90:89:66"] - ifname: enp12s0 - spaces: [public] + spaces: [floating] mac: ["00:A0:A5:90:89:67"] - ifname: enp3s0f1 spaces: [data] @@ -29,7 +29,7 @@ lab: spaces: [admin] mac: ["00:A0:A5:90:89:A8"] - ifname: enp12s0 - spaces: [public] + spaces: [floating] mac: ["00:A0:A5:90:89:A9"] - ifname: enp3s0f1 spaces: [data] @@ -47,7 +47,7 @@ lab: spaces: [admin] mac: ["00:A0:A5:90:89:28"] - ifname: enp12s0 - spaces: [public] + spaces: [floating] mac: ["00:A0:A5:90:89:29"] - ifname: enp3s0f1 spaces: [data] @@ -65,7 +65,7 @@ lab: spaces: [admin] mac: ["00:A0:A5:89:30:C6"] - ifname: enp12s0 - spaces: [public] + spaces: [floating] mac: ["00:A0:A5:89:30:C7"] - ifname: enp3s0f1 spaces: [data] @@ -83,7 +83,7 @@ lab: spaces: [admin] mac: ["00:A0:A5:90:89:94"] - ifname: enp12s0 - spaces: [public] + spaces: [floating] mac: ["00:A0:A5:90:89:95"] - ifname: enp3s0f1 spaces: [data] @@ -122,5 +122,5 @@ opnfv: - type: data bridge: brData cidr: 192.168.20.0/24 - gateway: 192.168.20.1 + gateway: 192.168.20.254 vlan:
\ No newline at end of file |