From: Narinder Gupta Date: Tue, 10 May 2016 15:33:40 +0000 (-0600) Subject: enabling Intel podp for EMC scalio X-Git-Tag: colorado.1.0~190^2~1 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=22d094cd3f680a1f83487f3e983e893ef2ae3af1;p=joid.git enabling Intel podp for EMC scalio Change-Id: Id992dc064179eb2a2256f08555aeb34acac98522 Signed-off-by: Narinder Gupta --- diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh index 6640ef0a..e85d57c1 100755 --- a/ci/01-deploybundle.sh +++ b/ci/01-deploybundle.sh @@ -55,6 +55,16 @@ case "$3" in # Use host for public API for Orange pod2 # sed -i -- 's/#os-public-hostname: api.public-fqdn/os-public-hostname: api.pod2.opnfv.fr/g' ./bundles.yaml ;; + 'intelpod9' ) + # As per your lab vip address list be deafult uses 10.9.1.11 - 10.9.1.20 + sed -i -- 's/10.4.1.1/10.9.1.2/g' ./bundles.yaml + # choose the correct interface to use for data network + sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.9.12.0\/24/g' ./bundles.yaml + # Choose the external port to go out from gateway to use. + sed -i -- 's/#ext-port: "eth1"/ext-port: "eth5"/g' ./bundles.yaml + # Provide the gateway MAC to route the traffic externally. + sed -i -- 's/#gateway-mac: "default"/gateway-mac: "default"/g' ./bundles.yaml + ;; 'intelpod6' ) # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 sed -i -- 's/10.4.1.1/10.6.1.2/g' ./bundles.yaml diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh index cc41ecf1..fa65c117 100755 --- a/ci/02-maasdeploy.sh +++ b/ci/02-maasdeploy.sh @@ -11,6 +11,9 @@ case "$1" in 'intelpod6' ) cp maas/intel/pod6/deployment.yaml ./deployment.yaml ;; + 'intelpod9' ) + cp maas/intel/pod9/deployment.yaml ./deployment.yaml + ;; 'orangepod1' ) cp maas/orange/pod1/deployment.yaml ./deployment.yaml ;; @@ -204,6 +207,11 @@ case "$1" in enableautomodebyname eth4 AUTO "10.6.12.0/24" compute || true enableautomodebyname eth4 AUTO "10.6.12.0/24" control || true ;; + 'intelpod9' ) + maas refresh + enableautomodebyname eth4 AUTO "10.9.12.0/24" compute || true + enableautomodebyname eth4 AUTO "10.9.12.0/24" control || true + ;; 'orangepod2' ) maas refresh enableautomodebyname eth4 DHCP "192.168.22.0/24" compute || true diff --git a/ci/maas/intel/pod9/deployment.yaml b/ci/maas/intel/pod9/deployment.yaml new file mode 100755 index 00000000..4b03abd0 --- /dev/null +++ b/ci/maas/intel/pod9/deployment.yaml @@ -0,0 +1,211 @@ +# 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 + + # Apt http proxy setting(s) + apt_http_proxy: + + apt_sources: + - ppa:maas/stable + - ppa:juju/stable + + # 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.9.1.1/system + + # Defines the IP Address that the configuration script will use to + # to access the MAAS controller via SSH. + ip_address: 10.9.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: intelpod9 + # 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.9.1.2 + netmask 255.255.255.0 + network 10.9.1.0 + broadcast 10.9.1.255 + gateway 10.9.1.1 + dns-nameservers 8.8.8.8 10.9.1.2 127.0.0.1 + + auto eth1 + iface eth1 inet static + address 10.9.12.2 + netmask 255.255.255.0 + + auto eth2 + iface eth2 inet static + address 10.9.15.2 + netmask 255.255.255.0 + + auto eth3 + iface eth3 inet static + address 10.2.117.143 + 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.9.1.2 + subnet_mask: 255.255.255.0 + broadcast_ip: 10.9.1.255 + router_ip: 10.9.1.1 + static_range: + low: 10.9.1.50 + high: 10.9.1.80 + dynamic_range: + low: 10.9.1.81 + high: 10.9.1.250 + - device: eth1 + ip: 10.9.12.2 + subnet_mask: 255.255.255.0 + broadcast_ip: 10.9.12.255 + management: 1 + static_range: + low: 10.9.12.20 + high: 10.9.12.150 + dynamic_range: + low: 10.9.12.151 + high: 10.9.12.200 + - device: eth2 + ip: 10.9.15.2 + subnet_mask: 255.255.255.0 + broadcast_ip: 10.9.15.255 + router_ip: 10.9.15.254 + management: 1 + static_range: + low: 10.9.15.20 + high: 10.9.15.150 + dynamic_range: + low: 10.9.15.151 + high: 10.9.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:D4:30:38" + power: + type: ipmi + address: 10.2.117.142 + 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:D4:33:A2" + power: + type: ipmi + address: 10.2.117.144 + 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:D4:2F:BA" + power: + type: ipmi + address: 10.2.117.146 + 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