diff options
| -rw-r--r-- | ci/.deploy.sh.swp | bin | 0 -> 12288 bytes | |||
| -rwxr-xr-x | ci/02-maasdeploy.sh | 3 | ||||
| -rw-r--r-- | ci/maas/att/virpod1/deployment.yaml | 126 | ||||
| -rw-r--r-- | ci/maas/att/virpod1/interfaces.host | 12 | ||||
| -rw-r--r-- | ci/maas/att/virpod1/lxc-add-more-interfaces | 35 | ||||
| -rwxr-xr-x | ci/odl/01-deploybundle.sh | 10 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-ha.yaml | 3 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-tip.yaml | 2 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl.yaml | 3 | ||||
| -rwxr-xr-x | ci/opencontrail/01-deploybundle.sh | 10 | ||||
| -rw-r--r-- | ci/opencontrail/juju-deployer/contrail-ha.yaml | 3 | ||||
| -rw-r--r-- | ci/opencontrail/juju-deployer/contrail-tip.yaml | 3 | ||||
| -rw-r--r-- | ci/opencontrail/juju-deployer/contrail.yaml | 3 |
13 files changed, 213 insertions, 0 deletions
diff --git a/ci/.deploy.sh.swp b/ci/.deploy.sh.swp Binary files differnew file mode 100644 index 00000000..8c03a38b --- /dev/null +++ b/ci/.deploy.sh.swp diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh index 253c4e2d..a18fe03c 100755 --- a/ci/02-maasdeploy.sh +++ b/ci/02-maasdeploy.sh @@ -12,6 +12,9 @@ case "$1" in 'orangepod2' ) cp maas/orange/pod2/deployment.yaml ./deployment.yaml ;; + 'attvirpod1' ) + cp maas/att/virpod1/deployment.yaml ./deployment.yaml + ;; * ) cp maas/intel/pod5/deployment.yaml ./deployment.yaml ;; diff --git a/ci/maas/att/virpod1/deployment.yaml b/ci/maas/att/virpod1/deployment.yaml new file mode 100644 index 00000000..dd57d150 --- /dev/null +++ b/ci/maas/att/virpod1/deployment.yaml @@ -0,0 +1,126 @@ +# 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-att + interfaces: ['bridge=brAdm,model=virtio'] + memory: 4096 + vcpus: 2 + 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://ubuntu@192.168.1.2/system + + # Defines the IP Address that the configuration script will use to + # to access the MAAS controller via SSH. + ip_address: 192.168.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: 192.168.1.2 + maas_name: intelpod6 + # 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.1.2 + netmask 255.255.255.0 + network 192.168.1.0 + broadcast 192.168.1.255 + gateway 192.168.1.1 + dns-nameservers 192.168.1.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.1.2 + subnet_mask: 255.255.255.0 + broadcast_ip: 192.168.1.255 + router_ip: 192.168.1.1 + static_range: + low: 192.168.1.20 + high: 192.168.1.100 + dynamic_range: + low: 192.168.1.101 + high: 192.168.1.200 + + # Defines the physical nodes which are added to the MAAS cluster + # controller upon startup of the node. + nodes: + - name: node2-control + tags: control + architecture: amd64/generic + mac_addresses: + - "00:1e:67:e0:0b:71" + power: + type: ether_wake + address: 38:63:bb:43:b8:9c + + - name: node5-compute + tags: compute + architecture: amd64/generic + mac_addresses: + - "00:1e:67:cf:bc:f7" + power: + type: ether_wake + address: 38:63:bb:43:b8:9d + + # Contains the virtual machine parameters for creating the Juju bootstrap + # node virtual machine + juju-bootstrap: + name: bootstrap + interfaces: ['bridge=brAdm,model=virtio'] + memory: 4096 + vcpus: 2 + arch: amd64 + pool: default + disk_size: 120G diff --git a/ci/maas/att/virpod1/interfaces.host b/ci/maas/att/virpod1/interfaces.host new file mode 100644 index 00000000..e837b2f1 --- /dev/null +++ b/ci/maas/att/virpod1/interfaces.host @@ -0,0 +1,12 @@ +#### original juju generated part #### +auto lo + +# Primary interface (defining the default route) +iface eth0 inet manual + +# Bridge to use for LXC/KVM containers +auto juju-br0 +iface juju-br0 inet dhcp + bridge_ports eth0 +###################################### + diff --git a/ci/maas/att/virpod1/lxc-add-more-interfaces b/ci/maas/att/virpod1/lxc-add-more-interfaces new file mode 100644 index 00000000..d9512c31 --- /dev/null +++ b/ci/maas/att/virpod1/lxc-add-more-interfaces @@ -0,0 +1,35 @@ +#!/bin/bash + +set -e +set -u + +cat <<EOF >> "$LXC_CONFIG_FILE" + +EOF + +USERDATA="$LXC_ROOTFS_PATH/var/lib/cloud/seed/nocloud-net/user-data" + +additional_interfaces=" +- | + cat <<EOF >> /etc/network/interfaces.d/additional-interfaces + ## added by juju charm + ## those interfaces will be brought up by the upstart job as /etc/init/additional-interfaces.conf + ## LP: #1483932 + EOF +- machine_agent=\$(hostname | sed -e 's/^juju-/jujud-/') +- | + cat <<EOF > /etc/init/additional-interfaces.conf + ## added by juju charm + ## LP: #1483932 + start on started \${machine_agent} + + script + sleep 10 + ifup -a -i /etc/network/interfaces.d/additional-interfaces + end script + EOF +" +additional_interfaces=$(echo "$additional_interfaces" | sed -e 's/$/\\n/' | tr -d '\n') + +sed -i.orig -e "s@^runcmd:@\0$additional_interfaces@" \ + "$USERDATA" diff --git a/ci/odl/01-deploybundle.sh b/ci/odl/01-deploybundle.sh index 707eac06..15ff77b1 100755 --- a/ci/odl/01-deploybundle.sh +++ b/ci/odl/01-deploybundle.sh @@ -56,6 +56,16 @@ case "$3" in # Choose the external port to go out from gateway to use. sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "brPublic"/g' ./bundles.yaml ;; + 'attvirpod1' ) + cp maas/att/virpod1/interfaces.host trusty/ubuntu-nodes-controller/network/interfaces.host + cp maas/att/virpod1/interfaces.host trusty/ubuntu-nodes-compute/network/interfaces.host + cp maas/att/airpod1/lxc-add-more-interfaces trusty/ubuntu-nodes-controller/lxc/add-more-interfaces + cp maas/att/airpod1/lxc-add-more-interfaces trusty/ubuntu-nodes-compute/lxc/add-more-interfaces + # 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/192.168.1.1/g' ./bundles.yaml + # Choose the external port to go out from gateway to use. + sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "juju-br0"/g' ./bundles.yaml + ;; esac echo "... Deployment Started ...." diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml index 20837260..f973f0cb 100644 --- a/ci/odl/juju-deployer/ovs-odl-ha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -334,6 +334,7 @@ trusty-liberty: overrides: cluster_count: 3 #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true region: Canonical source: "cloud:trusty-liberty" "openstack-origin": "cloud:trusty-liberty" @@ -350,6 +351,7 @@ trusty-kilo: overrides: cluster_count: 3 #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true region: Canonical source: "cloud:trusty-kilo" "openstack-origin": "cloud:trusty-kilo" @@ -367,6 +369,7 @@ trusty-juno: overrides: cluster_count: 3 #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true region: Canonical source: "cloud:trusty-juno" "openstack-origin": "cloud:trusty-juno" diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml index 0b880c91..3066ef3c 100644 --- a/ci/odl/juju-deployer/ovs-odl-tip.yaml +++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml @@ -262,6 +262,7 @@ trusty-liberty: inherits: openstack-phase2 overrides: #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true region: Canonical source: "cloud:trusty-liberty" "openstack-origin": "cloud:trusty-liberty" @@ -280,6 +281,7 @@ trusty-kilo: overrides: region: Canonical #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true openstack-origin: cloud:trusty-kilo source: cloud:trusty-kilo series: trusty diff --git a/ci/odl/juju-deployer/ovs-odl.yaml b/ci/odl/juju-deployer/ovs-odl.yaml index 17ca1183..0ab46c76 100644 --- a/ci/odl/juju-deployer/ovs-odl.yaml +++ b/ci/odl/juju-deployer/ovs-odl.yaml @@ -259,6 +259,7 @@ trusty-liberty: inherits: openstack-phase2 overrides: #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true region: Canonical source: "cloud:trusty-liberty" "openstack-origin": "cloud:trusty-liberty" @@ -274,6 +275,7 @@ trusty-kilo: inherits: openstack-phase2 overrides: #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true region: Canonical source: "cloud:trusty-kilo" "openstack-origin": "cloud:trusty-kilo" @@ -290,6 +292,7 @@ trusty-juno: inherits: openstack-phase2 overrides: #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true region: Canonical source: "cloud:trusty-juno" "openstack-origin": "cloud:trusty-juno" diff --git a/ci/opencontrail/01-deploybundle.sh b/ci/opencontrail/01-deploybundle.sh index 71725110..f9268b69 100755 --- a/ci/opencontrail/01-deploybundle.sh +++ b/ci/opencontrail/01-deploybundle.sh @@ -56,6 +56,16 @@ case "$3" in # Choose the external port to go out from gateway to use. sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "brPublic"/g' ./bundles.yaml ;; + 'attvirpod1' ) + cp maas/att/virpod1/interfaces.host trusty/ubuntu-nodes-controller/network/interfaces.host + cp maas/att/virpod1/interfaces.host trusty/ubuntu-nodes-compute/network/interfaces.host + cp maas/att/virpod1/lxc-add-more-interfaces trusty/ubuntu-nodes-controller/lxc/add-more-interfaces + cp maas/att/virpod1/lxc-add-more-interfaces trusty/ubuntu-nodes-compute/lxc/add-more-interfaces + # 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/192.168.1.1/g' ./bundles.yaml + # Choose the external port to go out from gateway to use. + sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "juju-br0"/g' ./bundles.yaml + ;; esac echo "... Deployment Started ...." diff --git a/ci/opencontrail/juju-deployer/contrail-ha.yaml b/ci/opencontrail/juju-deployer/contrail-ha.yaml index c6ce1bf8..cbe6b660 100644 --- a/ci/opencontrail/juju-deployer/contrail-ha.yaml +++ b/ci/opencontrail/juju-deployer/contrail-ha.yaml @@ -343,6 +343,7 @@ trusty-liberty: overrides: series: trusty #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true region: Canonical openstack-origin: cloud:trusty-liberty source: "cloud:trusty-liberty" @@ -360,6 +361,7 @@ trusty-kilo: overrides: series: trusty #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true region: Canonical openstack-origin: cloud:trusty-kilo source: "cloud:trusty-kilo" @@ -376,6 +378,7 @@ trusty-juno: overrides: series: trusty #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true region: Canonical openstack-origin: cloud:trusty-juno source: "cloud:trusty-juno" diff --git a/ci/opencontrail/juju-deployer/contrail-tip.yaml b/ci/opencontrail/juju-deployer/contrail-tip.yaml index e881c29b..a329dc6f 100644 --- a/ci/opencontrail/juju-deployer/contrail-tip.yaml +++ b/ci/opencontrail/juju-deployer/contrail-tip.yaml @@ -247,6 +247,7 @@ trusty-liberty: overrides: series: trusty #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true region: Canonical openstack-origin: cloud:trusty-liberty source: "cloud:trusty-liberty" @@ -269,6 +270,7 @@ trusty-kilo: overrides: series: trusty #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true region: Canonical openstack-origin: cloud:trusty-kilo source: "cloud:trusty-kilo" @@ -291,6 +293,7 @@ trusty-juno: overrides: series: trusty #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true region: Canonical openstack-origin: cloud:trusty-juno source: "cloud:trusty-juno" diff --git a/ci/opencontrail/juju-deployer/contrail.yaml b/ci/opencontrail/juju-deployer/contrail.yaml index 6e46daec..c9770df7 100644 --- a/ci/opencontrail/juju-deployer/contrail.yaml +++ b/ci/opencontrail/juju-deployer/contrail.yaml @@ -241,6 +241,7 @@ trusty-liberty: overrides: series: trusty #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true region: Canonical openstack-origin: cloud:trusty-liberty source: "cloud:trusty-liberty" @@ -263,6 +264,7 @@ trusty-kilo: overrides: series: trusty #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true region: Canonical openstack-origin: cloud:trusty-kilo source: "cloud:trusty-kilo" @@ -285,6 +287,7 @@ trusty-juno: overrides: series: trusty #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true region: Canonical openstack-origin: cloud:trusty-juno source: "cloud:trusty-juno" |