diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-01-18 09:46:04 -0600 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-01-18 09:48:23 -0600 |
| commit | 1fa4110c2cd0b0f623e2f8444b6088db9fcdd1fd (patch) | |
| tree | c4453b77a8c6281cbc3732aa443d2e385ab65053 /ci/trusty/ubuntu-nodes-compute/lxc | |
| parent | a14701ad782b38314165f6e2d9854d76aa97b95f (diff) | |
deleted as MAAS 1.9 handles all configuration so no need to have
special charm for configuration now.
Change-Id: I7268cee5479898b8da2007c590d9eaae5bb9441a
Diffstat (limited to 'ci/trusty/ubuntu-nodes-compute/lxc')
3 files changed, 0 insertions, 106 deletions
diff --git a/ci/trusty/ubuntu-nodes-compute/lxc/add-more-interface b/ci/trusty/ubuntu-nodes-compute/lxc/add-more-interface deleted file mode 100755 index c9bca9fd..00000000 --- a/ci/trusty/ubuntu-nodes-compute/lxc/add-more-interface +++ /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/trusty/ubuntu-nodes-compute/lxc/add-more-interfaces b/ci/trusty/ubuntu-nodes-compute/lxc/add-more-interfaces deleted file mode 100755 index c9bca9fd..00000000 --- a/ci/trusty/ubuntu-nodes-compute/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/trusty/ubuntu-nodes-compute/lxc/ubuntu-cloud.trusty.conf b/ci/trusty/ubuntu-nodes-compute/lxc/ubuntu-cloud.trusty.conf deleted file mode 100644 index b7636b58..00000000 --- a/ci/trusty/ubuntu-nodes-compute/lxc/ubuntu-cloud.trusty.conf +++ /dev/null @@ -1,2 +0,0 @@ -## added by juju charm -lxc.hook.clone = /usr/local/share/lxc/hooks/add-more-interfaces |