From: Narinder Gupta Date: Wed, 18 May 2016 06:13:08 +0000 (-0500) Subject: converting the new method to generate maas deployer file. X-Git-Tag: colorado.1.0~179 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9dca629c49f4309706058b583d15296b67ebed8a;p=joid.git converting the new method to generate maas deployer file. Change-Id: I9898a2fffd92f6e018bc1540bcd30229f3b0f0d8 Signed-off-by: Narinder Gupta --- diff --git a/ci/maas/orange/pod1/deployment.yaml b/labconfig/orange/pod1/deployment.yaml similarity index 100% rename from ci/maas/orange/pod1/deployment.yaml rename to labconfig/orange/pod1/deployment.yaml diff --git a/labconfig/orange/pod1/labconfig.yaml b/labconfig/orange/pod1/labconfig.yaml new file mode 100644 index 00000000..b0ca944b --- /dev/null +++ b/labconfig/orange/pod1/labconfig.yaml @@ -0,0 +1,76 @@ +labconfig: + lab_location: orangepod1 + bridges: + - type: admin + bridge: brAdm + cidr: 192.168.1.0/24 + gateway: 192.168.1.1 + - type: data + bridge: brData + cidr: 192.168.11.0/24 + gateway: + - type: storage + bridge: brStorage + cidr: 192.168.21.0/24 + gateway: + labsettings: + upstream_dns: 192.168.1.1 + nodes: + - type: compute + architecture: x86_64 + pxe_mac_address: + - "68:b5:99:74:e3:a8" + power: + type: ipmi + address: 192.168.1.11 + user: Administrator + pass: pod1Admin + - type: compute + architecture: x86_64 + pxe_mac_address: + - "68:b5:99:75:05:5e" + power: + type: ipmi + address: 192.168.1.12 + user: Administrator + pass: pod1Admin + - type: control + architecture: x86_64 + pxe_mac_address: + - "94:57:a5:52:53:7c" + power: + type: ipmi + address: 192.168.1.13 + user: Administrator + pass: pod1Admin + - type: control + architecture: x86_64 + pxe_mac_address: + - "94:57:a5:52:c1:54" + power: + type: ipmi + address: 192.168.1.14 + user: Administrator + pass: pod1Admin + - type: control + architecture: x86_64 + pxe_mac_address: + - "94:57:a5:52:c1:d8" + power: + type: ipmi + address: 192.168.1.15 + user: Administrator + pass: pod1Admin +opnfv: + release: c + distro: trusty + type: nonha + openstack: liberty + sdncontroller: + - type: nosdn + storage: + - type: ceph + disk: /srv/osd + floating-ip-range: + feature: odl_l2 + ext-port: eth5 diff --git a/labconfig/orange/pod2/deployment.yaml b/labconfig/orange/pod2/deployment.yaml new file mode 100755 index 00000000..a5968ab9 --- /dev/null +++ b/labconfig/orange/pod2/deployment.yaml @@ -0,0 +1,262 @@ +# 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-orange + interfaces: ['bridge=brAdm,model=virtio', 'bridge=brData,model=virtio', 'bridge=brStorage,model=virtio'] + memory: 4096 + vcpus: 4 + arch: amd64 + pool: default + disk_size: 120G + 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://ubuntu@192.168.2.4/system + + # Defines the IP Address that the configuration script will use to + # to access the MAAS controller via SSH. + ip_address: 192.168.2.5 + + # 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://fr.archive.ubuntu.com/ubuntu + upstream_dns: 192.168.2.1 + maas_name: orangepod2 + # 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 192.168.2.5 + netmask 255.255.255.0 + network 192.168.2.0 + broadcast 192.168.2.255 + gateway 192.168.2.1 + dns-nameservers 192.168.2.1 127.0.0.1 + + auto eth1 + iface eth1 inet static + address 192.168.12.5 + netmask 255.255.255.0 + network 192.168.12.0 + broadcast 192.168.12.255 + + auto eth2 + iface eth2 inet static + address 192.168.22.5 + netmask 255.255.255.0 + network 192.168.22.0 + broadcast 192.168.22.255 + + #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: 192.168.2.5 + subnet_mask: 255.255.255.0 + broadcast_ip: 192.168.2.255 + router_ip: 192.168.2.1 + static_range: + low: 192.168.2.50 + high: 192.168.2.80 + dynamic_range: + low: 192.168.2.81 + high: 192.168.2.254 + - device: eth1 + ip: 192.168.12.5 + subnet_mask: 255.255.255.0 + broadcast_ip: 192.168.12.255 + management: 1 + static_range: + low: 192.168.12.50 + high: 192.168.12.80 + dynamic_range: + low: 192.168.12.81 + high: 192.168.12.254 + - device: eth2 + ip: 192.168.22.5 + subnet_mask: 255.255.255.0 + broadcast_ip: 192.168.22.255 + management: 1 + static_range: + low: 192.168.22.50 + high: 192.168.22.80 + dynamic_range: + low: 192.168.22.81 + high: 192.168.22.254 + + # Defines the physical nodes which are added to the MAAS cluster + # controller upon startup of the node. + nodes: + - name: node1-compute + tags: compute + architecture: amd64/generic + mac_addresses: + - "38:63:bb:3f:bc:c8" + power: + type: ipmi + address: 192.168.2.11 + user: Administrator + pass: pod2Admin + driver: LAN_2_0 +# sticky_ip_address: +# mac_address: "38:63:bb:43:b8:9c" +# requested_address: 192.168.122.5 +# + - name: node2-compute + tags: compute + architecture: amd64/generic + mac_addresses: + - "38:63:bb:44:34:84" + power: + type: ipmi + address: 192.168.2.12 + user: Administrator + pass: pod2Admin + driver: LAN_2_0 + + - name: node3-compute + tags: compute + architecture: amd64/generic + mac_addresses: + - "38:63:bb:3f:1d:8c" + power: + type: ipmi + address: 192.168.2.13 + user: Administrator + pass: pod2Admin + driver: LAN_2_0 + + - name: node4-compute + tags: compute + architecture: amd64/generic + mac_addresses: + - "38:63:bb:3f:2d:a8" + power: + type: ipmi + address: 192.168.2.14 + user: Administrator + pass: pod2Admin + driver: LAN_2_0 + + - name: node5-control + tags: control + architecture: amd64/generic + mac_addresses: + - "94:57:a5:52:c9:48" + power: + type: ipmi + address: 192.168.2.15 + user: Administrator + pass: pod2Admin + driver: LAN_2_0 + + - name: node6-control + tags: control + architecture: amd64/generic + mac_addresses: + - "94:57:a5:52:63:b0" + power: + type: ipmi + address: 192.168.2.16 + user: Administrator + pass: pod2Admin + driver: LAN_2_0 + + - name: node7-control + tags: control + architecture: amd64/generic + mac_addresses: + - "94:57:a5:52:f1:80" + power: + type: ipmi + address: 192.168.2.17 + user: Administrator + pass: pod2Admin + driver: LAN_2_0 + + # Contains the virtual machine parameters for creating the Juju bootstrap + # node virtual machine + juju-bootstrap: + name: bootstrap + interfaces: ['bridge=brAdm,model=virtio'] + memory: 8192 + vcpus: 2 + arch: amd64 + pool: default + disk_size: 60G diff --git a/labconfig/orange/pod2/labconfig.yaml b/labconfig/orange/pod2/labconfig.yaml new file mode 100644 index 00000000..8132579a --- /dev/null +++ b/labconfig/orange/pod2/labconfig.yaml @@ -0,0 +1,81 @@ +labconfig: + lab_location: intelpod5 + bridges: + - type: admin + bridge: brAdm + cidr: 10.5.1.0/24 + gateway: 10.5.1.1 + - type: data + bridge: brData + cidr: 10.5.12.0/24 + gateway: + - type: public + bridge: brPublic + cidr: 10.5.15.0/24 + gateway: 10.5.15.254 + - type: external + bridge: brExt + cidr: + gateway: + ipaddress: 10.2.117.92 + labsettings: + upstream_dns: 8.8.8.8 + nodes: + - type: control + architecture: x86_64 + pxe_mac_address: + - "00:1e:67:cf:bb:54" + power: + type: ipmi + address: 10.2.117.81 + user: root + pass: root + - type: control + architecture: x86_64 + pxe_mac_address: + - "00:1e:67:cf:b8:93" + power: + type: ipmi + address: 10.2.117.82 + user: root + pass: root + - type: control + architecture: x86_64 + pxe_mac_address: + - "00:1e:67:e0:08:7f" + power: + type: ipmi + address: 10.2.117.83 + user: root + pass: root + - type: compute + architecture: x86_64 + pxe_mac_address: + - "00:1e:67:e0:08:b1" + power: + type: ipmi + address: 10.2.117.84 + user: root + pass: root + - type: compute + architecture: x86_64 + pxe_mac_address: + - "00:1e:67:e0:0a:4b" + power: + type: ipmi + address: 10.2.117.85 + user: root + pass: root +opnfv: + release: c + distro: trusty + type: nonha + openstack: liberty + sdncontroller: + - type: nosdn + storage: + - type: ceph + disk: /srv/osd + floating-ip-range: + feature: odl_l2 + ext-port: eth5