diff options
-rwxr-xr-x | ci/02-maasdeploy.sh | 2 | ||||
-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/maas/cengn_lynx/pod1/deployment.yaml | 18 | ||||
-rw-r--r-- | ci/maas/custom/deployment.yaml | 21 | ||||
-rw-r--r-- | ci/maas/default/deployment.yaml | 21 | ||||
-rw-r--r-- | ci/maas/default/interfaces.host | 12 | ||||
-rw-r--r-- | ci/maas/default/lxc-add-more-interfaces | 35 | ||||
-rwxr-xr-x | ci/maas/intel/pod5/deployment.yaml | 18 | ||||
-rwxr-xr-x | ci/maas/intel/pod6/deployment.yaml | 18 | ||||
-rwxr-xr-x | ci/maas/intel/pod9/deployment.yaml | 18 | ||||
-rwxr-xr-x | ci/maas/juniper/pod1/deployment.yaml | 18 | ||||
-rw-r--r-- | ci/maas/orange/pod1/deployment.yaml | 18 | ||||
-rw-r--r-- | ci/maas/orange/pod2/compute-interfaces.host | 27 | ||||
-rw-r--r-- | ci/maas/orange/pod2/control-interfaces.host | 27 | ||||
-rwxr-xr-x | ci/maas/orange/pod2/deployment.yaml | 18 | ||||
-rw-r--r-- | ci/maas/orange/pod2/interfaces.host | 36 | ||||
-rwxr-xr-x | ci/maas/orange/pod2/lxc-add-more-interfaces | 43 |
18 files changed, 164 insertions, 233 deletions
diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh index 9f48bd94..1f68a7d4 100755 --- a/ci/02-maasdeploy.sh +++ b/ci/02-maasdeploy.sh @@ -155,8 +155,6 @@ maas_ip=`grep " ip_address" deployment.yaml | cut -d " " -f 10` apikey=`grep maas-oauth: environments.yaml | cut -d "'" -f 2` maas login maas http://${maas_ip}/MAAS/api/1.0 ${apikey} maas maas boot-source update 1 url="http://maas.ubuntu.com/images/ephemeral-v2/daily/" -#maas maas boot-source-selections create 1 os="ubuntu" release="precise" arches="amd64" subarches="*" labels="*" -maas maas node-groups import-boot-images maas maas sshkeys new key="`cat $HOME/.ssh/id_rsa.pub`" #Added the Qtip public to run the Qtip test after install on bare metal nodes. diff --git a/ci/maas/att/virpod1/interfaces.host b/ci/maas/att/virpod1/interfaces.host deleted file mode 100644 index e837b2f1..00000000 --- a/ci/maas/att/virpod1/interfaces.host +++ /dev/null @@ -1,12 +0,0 @@ -#### 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 deleted file mode 100644 index d9512c31..00000000 --- a/ci/maas/att/virpod1/lxc-add-more-interfaces +++ /dev/null @@ -1,35 +0,0 @@ -#!/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/maas/cengn_lynx/pod1/deployment.yaml b/ci/maas/cengn_lynx/pod1/deployment.yaml index de3ee85e..6b03c1e2 100755 --- a/ci/maas/cengn_lynx/pod1/deployment.yaml +++ b/ci/maas/cengn_lynx/pod1/deployment.yaml @@ -17,6 +17,7 @@ cengn-lynx-pod1: arch: amd64 pool: default disk_size: 160G + series: trusty # Apt http proxy setting(s) apt_http_proxy: @@ -25,6 +26,23 @@ cengn-lynx-pod1: - ppa:maas/stable - ppa:juju/stable + boot_source: + url: http://maas.ubuntu.com/images/ephemeral-v2/releases/ + keyring_filename: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg + 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 diff --git a/ci/maas/custom/deployment.yaml b/ci/maas/custom/deployment.yaml index 9207eebd..ad2e2a0c 100644 --- a/ci/maas/custom/deployment.yaml +++ b/ci/maas/custom/deployment.yaml @@ -30,15 +30,32 @@ demo-maas: arch: amd64 pool: default disk_size: 60G + release: trusty # Apt http proxy setting(s) - #apt_http_proxy: + apt_http_proxy: - # Package sources. These will be used on the MAAS controller. apt_sources: - ppa:maas/stable - ppa:juju/stable + boot_source: + url: http://maas.ubuntu.com/images/ephemeral-v2/releases/ + keyring_filename: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg + 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 diff --git a/ci/maas/default/deployment.yaml b/ci/maas/default/deployment.yaml index 9207eebd..ad2e2a0c 100644 --- a/ci/maas/default/deployment.yaml +++ b/ci/maas/default/deployment.yaml @@ -30,15 +30,32 @@ demo-maas: arch: amd64 pool: default disk_size: 60G + release: trusty # Apt http proxy setting(s) - #apt_http_proxy: + apt_http_proxy: - # Package sources. These will be used on the MAAS controller. apt_sources: - ppa:maas/stable - ppa:juju/stable + boot_source: + url: http://maas.ubuntu.com/images/ephemeral-v2/releases/ + keyring_filename: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg + 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 diff --git a/ci/maas/default/interfaces.host b/ci/maas/default/interfaces.host deleted file mode 100644 index e837b2f1..00000000 --- a/ci/maas/default/interfaces.host +++ /dev/null @@ -1,12 +0,0 @@ -#### 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/default/lxc-add-more-interfaces b/ci/maas/default/lxc-add-more-interfaces deleted file mode 100644 index d9512c31..00000000 --- a/ci/maas/default/lxc-add-more-interfaces +++ /dev/null @@ -1,35 +0,0 @@ -#!/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/maas/intel/pod5/deployment.yaml b/ci/maas/intel/pod5/deployment.yaml index 29bed005..6600e954 100755 --- a/ci/maas/intel/pod5/deployment.yaml +++ b/ci/maas/intel/pod5/deployment.yaml @@ -17,6 +17,7 @@ demo-maas: arch: amd64 pool: default disk_size: 160G + release: trusty # Apt http proxy setting(s) apt_http_proxy: @@ -25,6 +26,23 @@ demo-maas: - ppa:maas/stable - ppa:juju/stable + boot_source: + url: http://maas.ubuntu.com/images/ephemeral-v2/releases/ + keyring_filename: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg + 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 diff --git a/ci/maas/intel/pod6/deployment.yaml b/ci/maas/intel/pod6/deployment.yaml index d94778c8..ef1d8755 100755 --- a/ci/maas/intel/pod6/deployment.yaml +++ b/ci/maas/intel/pod6/deployment.yaml @@ -17,6 +17,7 @@ demo-maas: arch: amd64 pool: default disk_size: 160G + release: trusty # Apt http proxy setting(s) apt_http_proxy: @@ -25,6 +26,23 @@ demo-maas: - ppa:maas/stable - ppa:juju/stable + boot_source: + url: http://maas.ubuntu.com/images/ephemeral-v2/releases/ + keyring_filename: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg + 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 diff --git a/ci/maas/intel/pod9/deployment.yaml b/ci/maas/intel/pod9/deployment.yaml index b11f1ee7..20aee25c 100755 --- a/ci/maas/intel/pod9/deployment.yaml +++ b/ci/maas/intel/pod9/deployment.yaml @@ -17,6 +17,7 @@ demo-maas: arch: amd64 pool: default disk_size: 160G + release: trusty # Apt http proxy setting(s) apt_http_proxy: @@ -25,6 +26,23 @@ demo-maas: - ppa:maas/stable - ppa:juju/stable + boot_source: + url: http://maas.ubuntu.com/images/ephemeral-v2/releases/ + keyring_filename: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg + 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 diff --git a/ci/maas/juniper/pod1/deployment.yaml b/ci/maas/juniper/pod1/deployment.yaml index efb49372..ead7abd6 100755 --- a/ci/maas/juniper/pod1/deployment.yaml +++ b/ci/maas/juniper/pod1/deployment.yaml @@ -17,6 +17,7 @@ demo-maas: arch: amd64 pool: default disk_size: 160G + release: trusty # Apt http proxy setting(s) apt_http_proxy: @@ -25,6 +26,23 @@ demo-maas: - ppa:maas/stable - ppa:juju/stable + boot_source: + url: http://maas.ubuntu.com/images/ephemeral-v2/releases/ + keyring_filename: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg + 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 diff --git a/ci/maas/orange/pod1/deployment.yaml b/ci/maas/orange/pod1/deployment.yaml index dcc8c447..9c5fbfee 100644 --- a/ci/maas/orange/pod1/deployment.yaml +++ b/ci/maas/orange/pod1/deployment.yaml @@ -17,6 +17,7 @@ demo-maas: arch: amd64 pool: default disk_size: 120G + release: trusty # Apt http proxy setting(s) apt_http_proxy: @@ -25,6 +26,23 @@ demo-maas: - ppa:maas/stable - ppa:juju/stable + boot_source: + url: http://maas.ubuntu.com/images/ephemeral-v2/releases/ + keyring_filename: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg + 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 diff --git a/ci/maas/orange/pod2/compute-interfaces.host b/ci/maas/orange/pod2/compute-interfaces.host deleted file mode 100644 index 185638e3..00000000 --- a/ci/maas/orange/pod2/compute-interfaces.host +++ /dev/null @@ -1,27 +0,0 @@ -#### 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 - -###################################### -#storage network for ceph on openstack -auto eth1 -iface eth1 inet dhcp - -###################################### -#data network for VM on openstack -auto eth5 -iface eth5 inet manual - -auto brData -iface brData inet dhcp - bridge_ports eth5 - bridge_stp off - bridge_fd 0 - bridge_maxwait 0 diff --git a/ci/maas/orange/pod2/control-interfaces.host b/ci/maas/orange/pod2/control-interfaces.host deleted file mode 100644 index e4604461..00000000 --- a/ci/maas/orange/pod2/control-interfaces.host +++ /dev/null @@ -1,27 +0,0 @@ -#### 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 - -###################################### -#storage network for ceph on openstack -auto eth1 -iface eth1 inet dhcp - -###################################### -#data network for VM on openstack -auto eth3 -iface eth3 inet manual - -auto brData -iface brData inet dhcp - bridge_ports eth3 - bridge_stp off - bridge_fd 0 - bridge_maxwait 0 diff --git a/ci/maas/orange/pod2/deployment.yaml b/ci/maas/orange/pod2/deployment.yaml index 69af58d9..273f752d 100755 --- a/ci/maas/orange/pod2/deployment.yaml +++ b/ci/maas/orange/pod2/deployment.yaml @@ -17,6 +17,7 @@ demo-maas: arch: amd64 pool: default disk_size: 120G + release: trusty # Apt http proxy setting(s) apt_http_proxy: @@ -25,6 +26,23 @@ demo-maas: - ppa:maas/stable - ppa:juju/stable + boot_source: + url: http://maas.ubuntu.com/images/ephemeral-v2/releases/ + keyring_filename: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg + 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 diff --git a/ci/maas/orange/pod2/interfaces.host b/ci/maas/orange/pod2/interfaces.host deleted file mode 100644 index 9377814c..00000000 --- a/ci/maas/orange/pod2/interfaces.host +++ /dev/null @@ -1,36 +0,0 @@ -#### 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 -###################################### - -auto eth2 -iface eth2 inet manual - -auto eth2.721 -iface eth2.721 inet manual - -auto brData -iface brData inet dhcp - bridge_ports eth2.721 - bridge_stp off - bridge_fd 0 - bridge_maxwait 0 - -# The public network interface -auto eth2.724 -iface eth2.724 inet manual - -auto brPublic -iface brPublic inet dhcp - bridge_ports eth2.724 - bridge_stp off - bridge_fd 0 - bridge_maxwait 0 - diff --git a/ci/maas/orange/pod2/lxc-add-more-interfaces b/ci/maas/orange/pod2/lxc-add-more-interfaces deleted file mode 100755 index a22901a0..00000000 --- a/ci/maas/orange/pod2/lxc-add-more-interfaces +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -set -e -set -u - -cat <<EOF >> "$LXC_CONFIG_FILE" - -## added by juju charm -lxc.network.type = veth -lxc.network.flags = up -lxc.network.link = brData -lxc.network.name = eth1 -lxc.network.hwaddr = 00:16:3e:$(openssl rand -hex 3| sed 's/\(..\)/\1:/g; s/.$//') -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 - auto eth1 - iface eth1 inet dhcp - 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" |