Cruft cleanup. (#75)

* Cruft cleanup.

Organized snapcraft.yaml better, and got rid of unecessary bits.

* Cleaned up scripts.

Moved launch.sh into snap-overlay, to be more consistent with
everything else.

Got rid of outdated and confusing configure-the-things script.

* Clarified a comment.

* Got rid of erroneous config file.

* Undeleted config file -- wasn't erroneous!

snap-overlay/templates/virtlogd.conf.j2

@@ -10,7 +10,7 @@
 # basically 1 will log everything possible
 
 #log_level = 3
-log_level = 1
+#log_level = 1
 
 # Logging filters:
 # A filter allows to select a different logging level for a given category
@@ -33,7 +33,7 @@ log_level = 1
 # e.g. to only get warning or errors from the remote layer and only errors
 # from the event layer:
 #log_filters="3:remote 4:event"
-log_filters="1:qemu 3:remote 4:event 3:util.json 3:rpc"
+#log_filters="1:qemu 3:remote 4:event 3:util.json 3:rpc"
 
 # Logging outputs:
 # An output is one of the places to save logging information
@@ -56,7 +56,7 @@ log_filters="1:qemu 3:remote 4:event 3:util.json 3:rpc"
 # e.g. to log all warnings and errors to syslog under the virtlogd ident:
 #log_outputs="3:syslog:virtlogd"
 #
-log_outputs="1:file:{{ snap_common }}/log/libvirtd.log"
+#log_outputs="1:file:{{ snap_common }}/log/libvirtd.log"
 
 # The maximum number of concurrent client connections to allow
 # over all sockets combined.

snapcraft.yaml

@@ -309,6 +309,8 @@ apps:
 #    plugs:
 #      - network-bind
 
+  # Utility to launch a vm. Creates security groups, floating ips,
+  # and other necessities as well.
   launch:
     command: bin/launch.sh
 #    plugs:
@@ -341,9 +343,9 @@ parts:
       - git
       - libffi-dev
       - libssl-dev
+      - libvirt-dev
       - libxml2-dev
       - libxslt1-dev
-      - libvirt-dev
     stage-packages:
       - conntrack
       - coreutils
@@ -745,18 +747,9 @@ parts:
 
   # Memcached Token Caching
   memcached:
-    plugin: autotools
-    source: https://memcached.org/files/memcached-1.5.14.tar.gz
-    build-packages:
-      - libevent-dev
-      - gcc
-      - make
+    plugin: nil
     stage-packages:
-      - libevent-2.1-6
-    override-build: |
-      ./configure --prefix=$SNAPCRAFT_PART_INSTALL
-      make
-      make install
+      - memcached
 
   # Cinder LVM backend
   lvm2:
@@ -767,22 +760,18 @@ parts:
       - --with-default-system-dir=/var/snap/$SNAPCRAFT_PROJECT_NAME/common/etc/
     build-attributes: [no-patchelf]
 
-  # Misc utils for hypervisor networking
-  bridge-utils:
-    source: https://www.kernel.org/pub/linux/utils/net/bridge-utils/bridge-utils-1.6.tar.gz
-    plugin: autotools
-  iproute2:
-    source: https://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-4.20.0.tar.gz
-    plugin: autotools
-    build-packages:
-      - bison
-      - flex
-      - libdb5.3-dev
+  # Networking tools
   iptables:
     source: http://iptables.netfilter.org/projects/iptables/files/iptables-1.6.0.tar.bz2
     plugin: autotools
     build-packages:
       - libnftnl-dev
+    stage-packages:
+      - libatm1
+      # Additional utilties for hypervisor networking
+      - iproute2
+      - bridge-utils
+      - ipset
     configflags:
       - --disable-nftables
       - --prefix=/snap/$SNAPCRAFT_PROJECT_NAME/current
@@ -797,26 +786,7 @@ parts:
       # * is not used to avoid directory merge conflicts
       snap/microstack/current/: ./
 
-  ipset:
-    source: http://ipset.netfilter.org/ipset-6.30.tar.bz2
-    plugin: autotools
-    build-packages:
-      - libltdl-dev
-      - libmnl-dev
-    configflags:
-      - "--with-kmod=no"
-
-  launch:
-    plugin: dump
-    source: src/launch
-    organize:
-      launch.sh: bin/launch.sh
-
-  # Openstack Shared Parts
+  # Templates and other files to be overlaid over the snap.
   overlay:
     plugin: dump
     source: snap-overlay
-
-  configure-the-things:
-    plugin: dump
-    source: src/experiments

src/experiments/bin/configure-the-things.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-/var/snap/microstack/common/bin/configure-the-things.sh
-
-exit 0
-
-microstack.mysql-client -u root -p$(`sudo cat /var/snap/microstack/common/log/error.log | grep "temporary password" | cut -d " " -f11`) --connect-expired-password | echo "ALTER USER 'root'@'10.20.20.1' IDENTIFIED BY 'fnord';"