diff options
| -rwxr-xr-x | ci/03-maasdeploy.sh | 3 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/bundle.yaml | 2 | ||||
| -rw-r--r-- | labconfig/juniper/pod1/labconfig.yaml | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh index 1387e6b3..58879df4 100755 --- a/ci/03-maasdeploy.sh +++ b/ci/03-maasdeploy.sh @@ -431,6 +431,7 @@ addnodes(){ units=$(($units - 1)); NODE_NAME=`cat labconfig.json | jq ".lab.racks[].nodes[$units].name" | cut -d \" -f 2 ` MAC_ADDRESS=`cat labconfig.json | jq ".lab.racks[].nodes[$units].nics[] | select(.spaces[]==\"admin\").mac"[0] | cut -d \" -f 2 ` + MAC_ADDRESS1=`cat labconfig.json | jq ".lab.racks[].nodes[$units].nics[] | select(.spaces[]==\"floating\").mac"[0] | cut -d \" -f 2 ` POWER_TYPE=`cat labconfig.json | jq ".lab.racks[].nodes[$units].power.type" | cut -d \" -f 2 ` POWER_IP=`cat labconfig.json | jq ".lab.racks[].nodes[$units].power.address" | cut -d \" -f 2 ` POWER_USER=`cat labconfig.json | jq ".lab.racks[].nodes[$units].power.user" | cut -d \" -f 2 ` @@ -439,7 +440,7 @@ addnodes(){ maas $PROFILE machines create autodetect_nodegroup='yes' name=$NODE_NAME \ hostname=$NODE_NAME power_type=$POWER_TYPE power_parameters_power_address=$POWER_IP \ power_parameters_power_user=$POWER_USER power_parameters_power_pass=$POWER_PASS mac_addresses=$MAC_ADDRESS \ - architecture='amd64/generic' + mac_addresses=$MAC_ADDRESS1 architecture='amd64/generic' done fi diff --git a/ci/config_tpl/juju2/bundle_tpl/bundle.yaml b/ci/config_tpl/juju2/bundle_tpl/bundle.yaml index 5a49b9a7..bfc297d0 100644 --- a/ci/config_tpl/juju2/bundle_tpl/bundle.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/bundle.yaml @@ -13,7 +13,7 @@ {% else %} num_units: 1 {% endif %} - constraints: tags=control + nodes-compute: charm: "cs:{{ ubuntu.release }}/ubuntu" {% if os.ha.mode == 'ha' %} diff --git a/labconfig/juniper/pod1/labconfig.yaml b/labconfig/juniper/pod1/labconfig.yaml index 87e2577c..b1b90ba9 100644 --- a/labconfig/juniper/pod1/labconfig.yaml +++ b/labconfig/juniper/pod1/labconfig.yaml @@ -101,6 +101,6 @@ opnfv: vlan: - type: floating bridge: brPublic - cidr: 10.10.10.0/24 + cidr: 10.10.0.0/20 gateway: vlan: |