diff options
author | Narinder Gupta <narinder.gupta@canonical.com> | 2016-05-06 13:04:42 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@172.30.200.206> | 2016-05-06 13:04:42 +0000 |
commit | 1a5ba662226bb7bbf3b5f2c6bb95e8b62998bda1 (patch) | |
tree | eec00c78f8bc7b27cd4e106c95a5e37420f07ed9 /ci/maas/intel | |
parent | b3e83ab6e58486d708a67594b4d94f2772503834 (diff) | |
parent | c64f24e26c24772f2a4a64ddb75c8e2855ed2a76 (diff) |
Merge "cleanup and also fetch the charms first then deploy."
Diffstat (limited to 'ci/maas/intel')
-rw-r--r-- | ci/maas/intel/pod5/interfaces.host | 36 | ||||
-rwxr-xr-x | ci/maas/intel/pod5/lxc-add-more-interfaces | 52 | ||||
-rw-r--r-- | ci/maas/intel/pod6/interfaces.host | 33 | ||||
-rwxr-xr-x | ci/maas/intel/pod6/lxc-add-more-interfaces | 52 |
4 files changed, 0 insertions, 173 deletions
diff --git a/ci/maas/intel/pod5/interfaces.host b/ci/maas/intel/pod5/interfaces.host deleted file mode 100644 index 9377814c..00000000 --- a/ci/maas/intel/pod5/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/intel/pod5/lxc-add-more-interfaces b/ci/maas/intel/pod5/lxc-add-more-interfaces deleted file mode 100755 index c9bca9fd..00000000 --- a/ci/maas/intel/pod5/lxc-add-more-interfaces +++ /dev/null @@ -1,52 +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/.$//') - -lxc.network.type = veth -lxc.network.flags = up -lxc.network.link = brPublic -lxc.network.name = eth2 -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 - - auto eth2 - iface eth2 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" diff --git a/ci/maas/intel/pod6/interfaces.host b/ci/maas/intel/pod6/interfaces.host deleted file mode 100644 index 86cdd056..00000000 --- a/ci/maas/intel/pod6/interfaces.host +++ /dev/null @@ -1,33 +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 eth1 -iface eth1 inet manual - -auto brData -iface brData inet dhcp - bridge_ports eth1 - bridge_stp off - bridge_fd 0 - bridge_maxwait 0 - -# The public network interface -auto eth2 -iface eth2 inet manual - -auto brPublic -iface brPublic inet dhcp - bridge_ports eth2 - bridge_stp off - bridge_fd 0 - bridge_maxwait 0 - diff --git a/ci/maas/intel/pod6/lxc-add-more-interfaces b/ci/maas/intel/pod6/lxc-add-more-interfaces deleted file mode 100755 index c9bca9fd..00000000 --- a/ci/maas/intel/pod6/lxc-add-more-interfaces +++ /dev/null @@ -1,52 +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/.$//') - -lxc.network.type = veth -lxc.network.flags = up -lxc.network.link = brPublic -lxc.network.name = eth2 -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 - - auto eth2 - iface eth2 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" |