diff options
| -rwxr-xr-x | ci/03-maasdeploy.sh | 19 | ||||
| -rwxr-xr-x | labconfig/intel/pod5/deployment.yaml | 257 | ||||
| -rw-r--r-- | labconfig/intel/pod5/labconfig.yaml | 78 |
3 files changed, 49 insertions, 305 deletions
diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh index 8e8b9900..c66bf16b 100755 --- a/ci/03-maasdeploy.sh +++ b/ci/03-maasdeploy.sh @@ -83,7 +83,7 @@ PROFILE=ubuntu MY_UPSTREAM_DNS=`grep "upstream_dns" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //'` SSH_KEY=`cat ~/.ssh/id_rsa.pub` MAIN_ARCHIVE=`grep "main_archive" deployconfig.yaml | cut -d ':' -f 2-3 | sed -e 's/ //'` -URL=https://images.maas.io/ephemeral-v2/daily/ +URL=https://images.maas.io/ephemeral-v3/daily/ KEYRING_FILE=/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg SOURCE_ID=1 FABRIC_ID=1 @@ -190,7 +190,7 @@ installmaas(){ configuremaas(){ #reconfigure maas with correct MAAS address. #Below code is needed as MAAS have issue in commisoning without restart. - sudo ./maas-reconfigure-region.sh $MAAS_IP + #sudo ./maas-reconfigure-region.sh $MAAS_IP sleep 30 sudo maas-rack config --region-url http://$MAAS_IP:5240/MAAS @@ -218,10 +218,10 @@ configuremaas(){ maas $PROFILE spaces create name=$space || true done - #maas $PROFILE boot-source update $SOURCE_ID \ - # url=$URL keyring_filename=$KEYRING_FILE || true + maas $PROFILE boot-source update $SOURCE_ID \ + url=$URL keyring_filename=$KEYRING_FILE || true + maas $PROFILE boot-resources import || true - sleep 10 while [ "$(maas $PROFILE boot-resources is-importing)" == "true" ]; do @@ -334,7 +334,7 @@ addnodes(){ # if we have a virshurl configuration we use it, else we use local VIRSHURL=$(cat labconfig.json | jq -r '.opnfv.virshurl') if ([ $VIRSHURL == "" ] || [ "$VIRSHURL" == "null" ]); then - VIRSHURL="qemu://$USER@$MAAS_IP/system " + VIRSHURL="qemu+ssh://$USER@$MAAS_IP/system " VIRSHHOST="" else VIRSHHOST=$(echo $VIRSHURL| cut -d\/ -f 3 | cut -d@ -f2) @@ -384,7 +384,7 @@ addnodes(){ maas $PROFILE machines create autodetect_nodegroup='yes' name='bootstrap' \ tags='bootstrap' hostname='bootstrap' power_type='virsh' mac_addresses=$bootstrapmac \ - power_parameters_power_address='qemu+ssh://'$USER'@'$VIRSHHOST'/system' \ + power_parameters_power_address="$VIRSHURL" \ architecture='amd64/generic' power_parameters_power_id='bootstrap' bootstrapid=$(maas $PROFILE machines read | jq -r '.[] | select(.hostname == "bootstrap").system_id') @@ -398,12 +398,12 @@ addnodes(){ units=$(($units - 1)); NODE_NAME=`cat labconfig.json | jq ".lab.racks[].nodes[$units].name" | cut -d \" -f 2 ` - sudo virt-install --connect qemu:///system --name $NODE_NAME --ram 8192 --cpu host --vcpus 4 \ + sudo virt-install --connect $VIRSHURL --name $NODE_NAME --ram 8192 --cpu host --vcpus 4 \ --disk size=120,format=qcow2,bus=virtio,cache=directsync,io=native,pool=default \ $netw $netw --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee $NODE_NAME nodemac=`grep "mac address" $NODE_NAME | head -1 | cut -d '"' -f 2` - sudo virsh -c qemu:///system define --file $NODE_NAME + sudo virsh -c $VIRSHURL --file $NODE_NAME rm -f $NODE_NAME maas $PROFILE machines create autodetect_nodegroup='yes' name=$NODE_NAME \ tags='control compute' hostname=$NODE_NAME power_type='virsh' mac_addresses=$nodemac \ @@ -451,6 +451,7 @@ setupspacenetwork #just make sure rack controller has been synced and import only # just whether images have been imported or not. +sudo ./maas-reconfigure-region.sh $MAAS_IP sleep 120 #lets add the nodes now. Currently works only for virtual deploymnet. diff --git a/labconfig/intel/pod5/deployment.yaml b/labconfig/intel/pod5/deployment.yaml deleted file mode 100755 index be8a7732..00000000 --- a/labconfig/intel/pod5/deployment.yaml +++ /dev/null @@ -1,257 +0,0 @@ -# This file defines the deployment for the MAAS environment which is to be -# deployed and automated. -demo-maas: - maas: - # Defines the general setup for the MAAS environment, including the - # username and password for the host as well as the MAAS server. - user: ubuntu - password: ubuntu - - # Contains the virtual machine parameters for creating the MAAS virtual - # server. Here you can configure the name of the virsh domain, the - # parameters for how the network is attached. - name: opnfv-maas-intel - interfaces: ['bridge=brAdm,model=virtio', 'bridge=brData,model=virtio', 'bridge=brPublic,model=virtio', 'bridge=brExt,model=virtio'] - memory: 4096 - vcpus: 4 - arch: amd64 - pool: default - disk_size: 160G - release: trusty - - # Apt http proxy setting(s) - apt_http_proxy: - - apt_sources: - - ppa:maas/stable - - ppa:juju/stable - - boot_source: - url: http://maas.ubuntu.com/images/ephemeral-v2/daily/ - keyring_filename: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg - exclusive: true - selections: - 1: - release: trusty - os: ubuntu - arches: amd64 - subarches: "*" - labels: daily - 2: - release: xenial - os: ubuntu - arches: amd64 - subarches: "*" - labels: daily - - # Virsh power settings - # Specifies the uri and keys to use for virsh power control of the - # juju virtual machine. If the uri is omitted, the value for the - # --remote is used. If no power settings are desired, then do not - # supply the virsh block. - virsh: - rsa_priv_key: /home/ubuntu/.ssh/id_rsa - rsa_pub_key: /home/ubuntu/.ssh/id_rsa.pub - uri: qemu+ssh://jenkins@10.5.1.1/system - - # Defines the IP Address that the configuration script will use to - # to access the MAAS controller via SSH. - ip_address: 10.5.1.2 - - # This section allows the user to set a series of options on the - # MAAS server itself. The list of config options can be found in - # the upstream MAAS documentation: - # - http://maas.ubuntu.com/docs/api.html#maas-server - settings: - main_archive: http://us.archive.ubuntu.com/ubuntu - upstream_dns: 8.8.8.8 - maas_name: intelpod5 - # kernel_opts: "console=tty0 console=ttyS1,115200n8" - # ntp_server: ntp.ubuntu.com - - # This section is used to define the networking parameters for when - # the node first comes up. It is fed into the meta-data cloud-init - # configuration and is used to configure the networking piece of the - # service. The contents of this section are written directly to the - # /etc/network/interfaces file. - # - # Please note, this is slightly different than the - # node-group-interfaces section below. This will configure the - # machine's networking params, and the node-group-interfaces will - # configure the maas node-group interfaces which is used for - # controlling the dhcp, dns, etc. - network_config: | - auto lo - iface lo inet loopback - - auto eth0 - iface eth0 inet static - address 10.5.1.2 - netmask 255.255.255.0 - network 10.5.1.0 - broadcast 10.5.1.255 - gateway 10.5.1.1 - dns-nameservers 8.8.8.8 10.5.1.2 127.0.0.1 - - auto eth1 - iface eth1 inet static - address 10.5.12.2 - netmask 255.255.255.0 - - auto eth2 - iface eth2 inet static - address 10.5.15.2 - netmask 255.255.255.0 - - auto eth3 - iface eth3 inet static - address 10.2.117.92 - netmask 255.255.255.0 - #auto lo - #iface lo inet loopback - - #auto eth0 - #iface eth0 inet static - # address 192.168.122.2 - # netmask 255.255.248.0 - # network 192.168.122.0 - # broadcast 192.168.122.255 - # gateway 192.168.122.1 - # dns-nameservers 192.168.122.1 127.0.0.1 - - # The node-group-interfaces section is used to configure the MAAS - # network interfaces. Basic configuration is supported, such as which - # device should be bound, the range of IP addresses, etc. - # Note: this may contain the special identifiers: - # ${maas_net} - the first 3 octets of the ipv4 address - # ${maas_ip} - the ip address of the MAAS controller - node_group_ifaces: - - device: eth0 - ip: 10.5.1.2 - subnet_mask: 255.255.255.0 - broadcast_ip: 10.5.1.255 - router_ip: 10.5.1.1 - static_range: - low: 10.5.1.50 - high: 10.5.1.80 - dynamic_range: - low: 10.5.1.81 - high: 10.5.1.250 - - device: eth1 - ip: 10.5.12.2 - subnet_mask: 255.255.255.0 - broadcast_ip: 10.5.12.255 - management: 1 - static_range: - low: 10.5.12.20 - high: 10.5.12.150 - dynamic_range: - low: 10.5.12.151 - high: 10.5.12.200 - - device: eth2 - ip: 10.5.15.2 - subnet_mask: 255.255.255.0 - broadcast_ip: 10.5.15.255 - router_ip: 10.5.15.254 - management: 1 - static_range: - low: 10.5.15.20 - high: 10.5.15.150 - dynamic_range: - low: 10.5.15.151 - high: 10.5.15.200 - - # 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:cf:bb:54" - power: - type: ipmi - address: 10.2.117.81 - 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 - mac_addresses: - - "00:1e:67:cf:b8:93" - power: - type: ipmi - address: 10.2.117.82 - user: root - pass: root - driver: LAN_2_0 - - - name: node3-control - tags: control - architecture: amd64/generic - mac_addresses: - - "00:1e:67:e0:08:7f" - power: - type: ipmi - address: 10.2.117.83 - 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: node4-compute - tags: compute - architecture: amd64/generic - mac_addresses: - - "00:1e:67:e0:08:b1" - power: - type: ipmi - address: 10.2.117.84 - 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: node5-compute - tags: compute - architecture: amd64/generic - mac_addresses: - - "00:1e:67:e0:0a:4b" - power: - type: ipmi - address: 10.2.117.85 - 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: jenkins-slave -# tags: jenkins-slave -# architecture: amd64/generic -# mac_addresses: -# - "52:54:00:f0:5c:53" -# power: -# type: virsh -# address: qemu+ssh://ubuntu@10.4.1.1/system - - # Contains the virtual machine parameters for creating the Juju bootstrap - # node virtual machine - juju-bootstrap: - name: bootstrap - interfaces: ['bridge=brAdm,model=virtio', 'bridge=brPublic,model=virtio', 'bridge=brExt,model=virtio'] - memory: 4096 - vcpus: 4 - arch: amd64 - pool: default - disk_size: 120G diff --git a/labconfig/intel/pod5/labconfig.yaml b/labconfig/intel/pod5/labconfig.yaml index 8ed4532b..48ff2abb 100644 --- a/labconfig/intel/pod5/labconfig.yaml +++ b/labconfig/intel/pod5/labconfig.yaml @@ -7,19 +7,19 @@ lab: architecture: x86_64 roles: [network,control] nics: - - ifname: enp4s0f3 + - ifname: intf0 spaces: [admin] mac: ["00:1E:67:CF:BB:54"] - - ifname: ens785f0 + - ifname: intf1 spaces: [data] mac: ["90:E2:BA:85:4E:2C"] - - ifname: ens785f1.504 + - ifname: intf2.504 spaces: [public] mac: ["90:E2:BA:85:4E:2D"] - - ifname: ens785f0.505 + - ifname: intf1.505 spaces: [floating] mac: ["90:E2:BA:85:4E:2C"] - - ifname: ens785f1 + - ifname: intf2 spaces: [storage] mac: ["90:E2:BA:85:4E:2D"] power: @@ -31,21 +31,21 @@ lab: architecture: x86_64 roles: [compute,control,storage] nics: - - ifname: enp4s0f3 + - ifname: intf0 spaces: [admin] mac: ["00:1E:67:CF:B8:93"] - - ifname: ens785f0 + - ifname: intf1 spaces: [data] mac: ["90:E2:BA:84:08:B8"] - - ifname: ens785f1.504 + - ifname: intf2.504 spaces: [public] mac: ["90:E2:BA:84:08:B9"] - - ifname: ens785f0.505 + - ifname: intf1.505 spaces: [floating] - mac: ["90:E2:BA:85:4E:2C"] - - ifname: ens785f1 + mac: ["90:E2:BA:84:08:B8"] + - ifname: intf2 spaces: [storage] - mac: ["90:E2:BA:85:4E:2D"] + mac: ["90:E2:BA:84:08:B9"] power: type: ipmi address: 10.2.117.86 @@ -55,21 +55,21 @@ lab: architecture: x86_64 roles: [compute,control,storage] nics: - - ifname: enp4s0f3 + - ifname: intf0 spaces: [admin] mac: ["00:1E:67:E0:08:7F"] - - ifname: ens785f0 + - ifname: intf1 spaces: [data] - mac: ["90:E2:BA:84:07:0D"] - - ifname: ens785f1.504 + mac: ["90:E2:BA:84:07:0C"] + - ifname: intf2.504 spaces: [public] - mac: ["90:E2:BA:84:07:0E"] - - ifname: ens785f0.505 + mac: ["90:E2:BA:84:07:0D"] + - ifname: intf1.505 spaces: [floating] - mac: ["90:E2:BA:85:4E:2C"] - - ifname: ens785f1 + mac: ["90:E2:BA:84:07:0C"] + - ifname: intf2 spaces: [storage] - mac: ["90:E2:BA:85:4E:2D"] + mac: ["90:E2:BA:84:07:0D"] power: type: ipmi address: 10.2.117.87 @@ -79,21 +79,21 @@ lab: architecture: x86_64 roles: [compute,storage] nics: - - ifname: enp4s0f3 + - ifname: intf0 spaces: [admin] mac: ["00:1E:67:E0:08:B1"] - - ifname: ens785f0 + - ifname: intf1 spaces: [data] mac: ["90:E2:BA:83:FD:80"] - - ifname: ens785f1.504 + - ifname: intf2.504 spaces: [public] mac: ["90:E2:BA:83:FD:81"] - - ifname: ens785f0.505 + - ifname: intf1.505 spaces: [floating] - mac: ["90:E2:BA:85:4E:2C"] - - ifname: ens785f1 + mac: ["90:E2:BA:83:FD:80"] + - ifname: intf2 spaces: [storage] - mac: ["90:E2:BA:85:4E:2D"] + mac: ["90:E2:BA:83:FD:81"] power: type: ipmi address: 10.2.117.88 @@ -103,21 +103,21 @@ lab: architecture: x86_64 roles: [compute,storage] nics: - - ifname: enp4s0f3 + - ifname: intf0 spaces: [admin] mac: ["00:1E:67:E0:0A:4B"] - - ifname: ens785f0 + - ifname: intf1 spaces: [data] mac: ["90:E2:BA:75:22:74"] - - ifname: ens785f1.504 + - ifname: intf2.504 spaces: [public] mac: ["90:E2:BA:75:22:75"] - - ifname: ens785f0.505 + - ifname: intf1.505 spaces: [floating] - mac: ["90:E2:BA:85:4E:2C"] - - ifname: ens785f1 + mac: ["90:E2:BA:75:22:74"] + - ifname: intf2 spaces: [storage] - mac: ["90:E2:BA:85:4E:2D"] + mac: ["90:E2:BA:75:22:75"] power: type: ipmi address: 10.2.117.89 @@ -127,13 +127,13 @@ lab: # architecture: x86_64 # roles: [compute,storage] # nics: -# - ifname: enp4s0f3 +# - ifname: intf0 # spaces: [admin] # mac: ["98:4F:EE:10:03:43"] -# - ifname: ens785f0 +# - ifname: intf1 # spaces: [data] # mac: ["00:1E:67:9C:3E:54"] -# - ifname: ens785f1.504 +# - ifname: intf2.504 # spaces: [public] # mac: ["00:1E:67:9C:3E:55"] # power: @@ -142,7 +142,7 @@ lab: # user: root # pass: root floating-ip-range: 10.5.15.6,10.5.15.250,10.5.15.1,10.5.15.0/24 - ext-port: "ens785f0.505" + xt-port: "intf1.505" dns: 8.8.8.8 osdomainname: opnfv: |