From 259ded0952e0f1401e705178b876fd99893808ea Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Mon, 18 Jan 2016 09:46:04 -0600 Subject: [PATCH] deleted as MAAS 1.9 handles all configuration so no need to have special charm for configuration now. Change-Id: I7268cee5479898b8da2007c590d9eaae5bb9441a (cherry picked from commit 1fa4110c2cd0b0f623e2f8444b6088db9fcdd1fd) --- ci/trusty/ubuntu-nodes-compute/README | 3 - ci/trusty/ubuntu-nodes-compute/copyright | 17 -- ci/trusty/ubuntu-nodes-compute/hooks/install | 30 --- ci/trusty/ubuntu-nodes-compute/icon.svg | 279 --------------------- .../ubuntu-nodes-compute/lxc/add-more-interface | 52 ---- .../ubuntu-nodes-compute/lxc/add-more-interfaces | 52 ---- .../lxc/ubuntu-cloud.trusty.conf | 2 - ci/trusty/ubuntu-nodes-compute/metadata.yaml | 7 - .../ubuntu-nodes-compute/network/interfaces.host | 36 --- ci/trusty/ubuntu-nodes-compute/revision | 1 - ci/trusty/ubuntu-nodes-controller/README | 3 - ci/trusty/ubuntu-nodes-controller/copyright | 17 -- ci/trusty/ubuntu-nodes-controller/hooks/install | 30 --- ci/trusty/ubuntu-nodes-controller/icon.svg | 279 --------------------- .../ubuntu-nodes-controller/lxc/add-more-interface | 52 ---- .../lxc/add-more-interfaces | 52 ---- .../lxc/ubuntu-cloud.trusty.conf | 2 - ci/trusty/ubuntu-nodes-controller/metadata.yaml | 7 - .../network/interfaces.host | 36 --- ci/trusty/ubuntu-nodes-controller/revision | 1 - 20 files changed, 958 deletions(-) delete mode 100644 ci/trusty/ubuntu-nodes-compute/README delete mode 100644 ci/trusty/ubuntu-nodes-compute/copyright delete mode 100755 ci/trusty/ubuntu-nodes-compute/hooks/install delete mode 100644 ci/trusty/ubuntu-nodes-compute/icon.svg delete mode 100755 ci/trusty/ubuntu-nodes-compute/lxc/add-more-interface delete mode 100755 ci/trusty/ubuntu-nodes-compute/lxc/add-more-interfaces delete mode 100644 ci/trusty/ubuntu-nodes-compute/lxc/ubuntu-cloud.trusty.conf delete mode 100644 ci/trusty/ubuntu-nodes-compute/metadata.yaml delete mode 100644 ci/trusty/ubuntu-nodes-compute/network/interfaces.host delete mode 100644 ci/trusty/ubuntu-nodes-compute/revision delete mode 100644 ci/trusty/ubuntu-nodes-controller/README delete mode 100644 ci/trusty/ubuntu-nodes-controller/copyright delete mode 100755 ci/trusty/ubuntu-nodes-controller/hooks/install delete mode 100644 ci/trusty/ubuntu-nodes-controller/icon.svg delete mode 100755 ci/trusty/ubuntu-nodes-controller/lxc/add-more-interface delete mode 100755 ci/trusty/ubuntu-nodes-controller/lxc/add-more-interfaces delete mode 100644 ci/trusty/ubuntu-nodes-controller/lxc/ubuntu-cloud.trusty.conf delete mode 100644 ci/trusty/ubuntu-nodes-controller/metadata.yaml delete mode 100644 ci/trusty/ubuntu-nodes-controller/network/interfaces.host delete mode 100644 ci/trusty/ubuntu-nodes-controller/revision diff --git a/ci/trusty/ubuntu-nodes-compute/README b/ci/trusty/ubuntu-nodes-compute/README deleted file mode 100644 index 1a73633f..00000000 --- a/ci/trusty/ubuntu-nodes-compute/README +++ /dev/null @@ -1,3 +0,0 @@ -You need to edit: - * network/interfaces.host - * lxc/add-more-interfaces diff --git a/ci/trusty/ubuntu-nodes-compute/copyright b/ci/trusty/ubuntu-nodes-compute/copyright deleted file mode 100644 index 43e04d48..00000000 --- a/ci/trusty/ubuntu-nodes-compute/copyright +++ /dev/null @@ -1,17 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ - -Files: * -Copyright: Copyright 2012, Canonical Ltd., All Rights Reserved. -License: GPL-3 - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see . diff --git a/ci/trusty/ubuntu-nodes-compute/hooks/install b/ci/trusty/ubuntu-nodes-compute/hooks/install deleted file mode 100755 index 17265f56..00000000 --- a/ci/trusty/ubuntu-nodes-compute/hooks/install +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -set -e -set -u - -## install lxc pre-configuration to setup multiple interfaces -status-set maintenance "setting up lxc clone hook" || true -mkdir -p /usr/local/share/lxc/hooks/ -install -m 755 lxc/add-more-interfaces /usr/local/share/lxc/hooks/ - -dpkg-divert --local \ - --divert /usr/share/lxc/config/ubuntu-cloud.trusty.conf.ubuntu.orig \ - --add /usr/share/lxc/config/ubuntu-cloud.trusty.conf -mkdir -p /usr/share/lxc/config/ -install -m 644 lxc/ubuntu-cloud.trusty.conf /usr/share/lxc/config/ - -## network interfaces -status-set maintenance "setting up network interfaces" || true -apt-get update || true -apt-get install -y ifenslave ethtool bridge-utils vlan - -if ! grep -q 8021q /etc/modules; then - echo 8021q >> /etc/modules -fi - -## write /etc/network/interfaces for the host -install -m 644 network/interfaces.host /etc/network/interfaces -ifup -a - -status-set active || true diff --git a/ci/trusty/ubuntu-nodes-compute/icon.svg b/ci/trusty/ubuntu-nodes-compute/icon.svg deleted file mode 100644 index a5576ed2..00000000 --- a/ci/trusty/ubuntu-nodes-compute/icon.svg +++ /dev/null @@ -1,279 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - 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 <> "$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 <> /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 < /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 <> "$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 <> /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 < /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 diff --git a/ci/trusty/ubuntu-nodes-compute/metadata.yaml b/ci/trusty/ubuntu-nodes-compute/metadata.yaml deleted file mode 100644 index 24626c71..00000000 --- a/ci/trusty/ubuntu-nodes-compute/metadata.yaml +++ /dev/null @@ -1,7 +0,0 @@ -name: ubuntu-nodes-compute -summary: A pristine Ubuntu Server -maintainer: Charmers -description: | - This simply deploys Ubuntu Server. -tags: - - misc diff --git a/ci/trusty/ubuntu-nodes-compute/network/interfaces.host b/ci/trusty/ubuntu-nodes-compute/network/interfaces.host deleted file mode 100644 index 9377814c..00000000 --- a/ci/trusty/ubuntu-nodes-compute/network/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/trusty/ubuntu-nodes-compute/revision b/ci/trusty/ubuntu-nodes-compute/revision deleted file mode 100644 index d00491fd..00000000 --- a/ci/trusty/ubuntu-nodes-compute/revision +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/ci/trusty/ubuntu-nodes-controller/README b/ci/trusty/ubuntu-nodes-controller/README deleted file mode 100644 index 1a73633f..00000000 --- a/ci/trusty/ubuntu-nodes-controller/README +++ /dev/null @@ -1,3 +0,0 @@ -You need to edit: - * network/interfaces.host - * lxc/add-more-interfaces diff --git a/ci/trusty/ubuntu-nodes-controller/copyright b/ci/trusty/ubuntu-nodes-controller/copyright deleted file mode 100644 index 43e04d48..00000000 --- a/ci/trusty/ubuntu-nodes-controller/copyright +++ /dev/null @@ -1,17 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ - -Files: * -Copyright: Copyright 2012, Canonical Ltd., All Rights Reserved. -License: GPL-3 - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see . diff --git a/ci/trusty/ubuntu-nodes-controller/hooks/install b/ci/trusty/ubuntu-nodes-controller/hooks/install deleted file mode 100755 index 17265f56..00000000 --- a/ci/trusty/ubuntu-nodes-controller/hooks/install +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -set -e -set -u - -## install lxc pre-configuration to setup multiple interfaces -status-set maintenance "setting up lxc clone hook" || true -mkdir -p /usr/local/share/lxc/hooks/ -install -m 755 lxc/add-more-interfaces /usr/local/share/lxc/hooks/ - -dpkg-divert --local \ - --divert /usr/share/lxc/config/ubuntu-cloud.trusty.conf.ubuntu.orig \ - --add /usr/share/lxc/config/ubuntu-cloud.trusty.conf -mkdir -p /usr/share/lxc/config/ -install -m 644 lxc/ubuntu-cloud.trusty.conf /usr/share/lxc/config/ - -## network interfaces -status-set maintenance "setting up network interfaces" || true -apt-get update || true -apt-get install -y ifenslave ethtool bridge-utils vlan - -if ! grep -q 8021q /etc/modules; then - echo 8021q >> /etc/modules -fi - -## write /etc/network/interfaces for the host -install -m 644 network/interfaces.host /etc/network/interfaces -ifup -a - -status-set active || true diff --git a/ci/trusty/ubuntu-nodes-controller/icon.svg b/ci/trusty/ubuntu-nodes-controller/icon.svg deleted file mode 100644 index a5576ed2..00000000 --- a/ci/trusty/ubuntu-nodes-controller/icon.svg +++ /dev/null @@ -1,279 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff --git a/ci/trusty/ubuntu-nodes-controller/lxc/add-more-interface b/ci/trusty/ubuntu-nodes-controller/lxc/add-more-interface deleted file mode 100755 index c9bca9fd..00000000 --- a/ci/trusty/ubuntu-nodes-controller/lxc/add-more-interface +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash - -set -e -set -u - -cat <> "$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 <> /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 < /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-controller/lxc/add-more-interfaces b/ci/trusty/ubuntu-nodes-controller/lxc/add-more-interfaces deleted file mode 100755 index c9bca9fd..00000000 --- a/ci/trusty/ubuntu-nodes-controller/lxc/add-more-interfaces +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash - -set -e -set -u - -cat <> "$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 <> /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 < /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-controller/lxc/ubuntu-cloud.trusty.conf b/ci/trusty/ubuntu-nodes-controller/lxc/ubuntu-cloud.trusty.conf deleted file mode 100644 index b7636b58..00000000 --- a/ci/trusty/ubuntu-nodes-controller/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 diff --git a/ci/trusty/ubuntu-nodes-controller/metadata.yaml b/ci/trusty/ubuntu-nodes-controller/metadata.yaml deleted file mode 100644 index 8a57c088..00000000 --- a/ci/trusty/ubuntu-nodes-controller/metadata.yaml +++ /dev/null @@ -1,7 +0,0 @@ -name: ubuntu-nodes-controller -summary: A pristine Ubuntu Server -maintainer: Charmers -description: | - This simply deploys Ubuntu Server. -tags: - - misc diff --git a/ci/trusty/ubuntu-nodes-controller/network/interfaces.host b/ci/trusty/ubuntu-nodes-controller/network/interfaces.host deleted file mode 100644 index 9377814c..00000000 --- a/ci/trusty/ubuntu-nodes-controller/network/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/trusty/ubuntu-nodes-controller/revision b/ci/trusty/ubuntu-nodes-controller/revision deleted file mode 100644 index d00491fd..00000000 --- a/ci/trusty/ubuntu-nodes-controller/revision +++ /dev/null @@ -1 +0,0 @@ -1 -- 2.16.6