diff --git a/containers/Makefile b/containers/Makefile
deleted file mode 100644
index 92685e7..0000000
--- a/containers/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-.PHONY: xos
-xos: nodes.yaml images.yaml
-	sudo docker-compose up -d
-	../xos/configurations/common/wait_for_xos_port.sh 8000
-	sudo docker-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /root/setup/setup.yaml
-	sudo docker-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /root/setup/nodes.yaml
-	sudo docker-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /root/setup/images.yaml
-
-nodes.yaml:
-	export SETUPDIR=.; bash ../xos/configurations/common/make-nodes-yaml.sh
-
-images.yaml:
-	export SETUPDIR=.; bash ../xos/configurations/common/make-images-yaml.sh
-
-.PHONY: local_containers
-local_containers:
-	cd containers/xos; make devel
-	cd containers/synchronizer; make
diff --git a/containers/README.md b/containers/README.md
deleted file mode 100644
index b4a8ea8..0000000
--- a/containers/README.md
+++ /dev/null
@@ -1,81 +0,0 @@
-# XOS Docker Images
-
-## Introduction
-
- XOS is comprised of 3 core services:
-
-  * A database backend (postgres)
-  * A webserver front end (django)
-  * A synchronizer daemon that interacts with the openstack backend.
-
-We have created separate dockerfiles for each of these services, making it
-easier to build the services independently and also deploy and run them in
-isolated environments.
-
-#### Database Container
-
-To build the database container:
-
-```
-$ cd postgresql; make build
-```
-
-#### XOS Container
-
-To build the XOS webserver container:
-
-```
-$ cd xos; make build
-```
-
-#### Synchronizer Container
-
-The Synchronizer shares many of the same dependencies as the XOS container. The
-synchronizer container takes advantage of this by building itself on top of the
-XOS image. This means you must build the XOS image before building the
-synchronizer image.  Assuming you have already built the XOS container,
-executing the following will build the Synchronizer container:
-
-```
-$ cd synchronizer; make build
-```
-
-#### Solution Compose File
-
-[Docker Compose](https://docs.docker.com/compose/) is a tool for defining and
-running multi-container Docker applications. With Compose, you use a Compose
-file to configure your application’s services. Then, using a single command, you
-create, start, scale, and manage all the services from your configuration.
-
-Included is a compose file in *YAML* format with content defined by the [Docker
-Compose Format](https://docs.docker.com/compose/compose-file/). With the compose
-file a complete XOS solution based on Docker containers can be instantiated
-using a single command. To start the instance you can use the command:
-
-```
-$ docker-compose up -d
-```
-
-You should now be able to access the login page by visiting
-`http://localhost:8000` and log in using the default `padmin@vicci.org` account
-with password `letmein`.
-
-## Configuring XOS for OpenStack
-
-There are many possible configurations of XOS. The best way to get started
-is to find the configuration that best matches your needs and modify it as
-necessary. The available "canned" configurations can be found i `../xos/configurations/`.
-
-If you have your own OpenStack cluster, and you would like to configure XOS to
-control it, then take the following steps. Copy the `admin-openrc.sh` credentials 
-file for your cluster to this directory.  Make sure that OpenStack commands work 
-from the local machine using the credentials, e.g., `source ./admin-openrc.sh; nova list`.  Then run:
-
-```
-$ make
-```
-
-XOS will be launched (the Makefile will run the `docker-compose up -d` command
-for you) and configured with the nodes and images available in your
-OpenStack cloud.  You can then log in to XOS as described above and start creating
-slices and instances.
diff --git a/containers/admin-openrc.sh b/containers/admin-openrc.sh
deleted file mode 100644
index f27fdac..0000000
--- a/containers/admin-openrc.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# Replace with the OpenStack admin credentials for your cluster
-export OS_TENANT_NAME=admin
-export OS_USERNAME=admin
-export OS_PASSWORD=admin
-export OS_AUTH_URL=http://localhost:35357/v2.0
-
diff --git a/containers/cord-apps/Dockerfile b/containers/cord-apps/Dockerfile
deleted file mode 100644
index 0bd5550..0000000
--- a/containers/cord-apps/Dockerfile
+++ /dev/null
@@ -1,26 +0,0 @@
-FROM debian:jessie
-MAINTAINER Andy Bavier <andy@onlab.us>
-
-# Add Java 8 repository
-ENV DEBIAN_FRONTEND noninteractive
-RUN echo debconf shared/accepted-oracle-license-v1-1 select true | debconf-set-selections && \
-    echo "deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee /etc/apt/sources.list.d/webupd8team-java.list && \
-    echo "deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee -a /etc/apt/sources.list.d/webupd8team-java.list && \
-    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys EEA14886
-
-# Set the environment variables
-ENV HOME /root
-ENV JAVA_HOME /usr/lib/jvm/java-8-oracle
-ENV ONOS_ROOT /src/onos
-ENV KARAF_VERSION 3.0.5
-ENV KARAF_ROOT /root/onos/apache-karaf-3.0.5
-ENV KARAF_LOG /root/onos/apache-karaf-3.0.5/data/log/karaf.log
-ENV BUILD_NUMBER docker
-ENV PATH $PATH:$KARAF_ROOT/bin
-
-#Download build environment for ONOS
-WORKDIR /src
-RUN     apt-get update && apt-get install -y python maven git curl oracle-java8-installer oracle-java8-set-default && \
-        git clone https://github.com/opennetworkinglab/onos.git && cd onos
-
-RUN echo ". /src/onos/tools/dev/bash_profile" >> /root/.bashrc
diff --git a/containers/cord-apps/Dockerfile.config b/containers/cord-apps/Dockerfile.config
deleted file mode 100644
index 4f34178..0000000
--- a/containers/cord-apps/Dockerfile.config
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM xosproject/cord-app-build
-MAINTAINER Andy Bavier <andy@onlab.us>
-
-WORKDIR /src
-RUN     git clone https://gerrit.opencord.org/p/config.git && cd config && \
-        mvn clean install
-
-CMD bash -c "source /root/.bashrc; onos-app onos-cord-1 install /src/config/target/cord-config-*.oar && onos-app onos-cord-1 activate org.opencord.config"
\ No newline at end of file
diff --git a/containers/cord-apps/Dockerfile.vtn b/containers/cord-apps/Dockerfile.vtn
deleted file mode 100644
index 6132284..0000000
--- a/containers/cord-apps/Dockerfile.vtn
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM xosproject/cord-app-build
-MAINTAINER Andy Bavier <andy@onlab.us>
-
-WORKDIR /src
-RUN     git clone https://gerrit.opencord.org/p/vtn.git && cd vtn && \
-        mvn clean install
-
-CMD bash -c "source /root/.bashrc; onos-app onos-cord-1 install /src/vtn/target/vtn-*.oar && onos-app onos-cord-1 activate org.opencord.vtn"
diff --git a/containers/cord-apps/Makefile b/containers/cord-apps/Makefile
deleted file mode 100644
index 76b0b87..0000000
--- a/containers/cord-apps/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-IMAGE_NAME:=xosproject/cord-app-build
-CONFIG_IMAGE_NAME:=xosproject/cord-app-config
-VTN_IMAGE_NAME:=xosproject/cord-app-vtn
-NO_DOCKER_CACHE?=false
-
-BUILD_ARGS =
-ifdef http_proxy
-BUILD_ARGS += --build-arg http_proxy=${http_proxy}
-endif
-ifdef https_proxy
-BUILD_ARGS += --build-arg https_proxy=${https_proxy}
-endif
-
-.PHONY: build
-build: ; sudo docker build --no-cache=${NO_DOCKER_CACHE} --rm -t ${IMAGE_NAME} ${BUILD_ARGS} .
-
-.PHONY: config
-config: ; sudo docker build --rm -t ${CONFIG_IMAGE_NAME} -f Dockerfile.config ${BUILD_ARGS} .
-
-.PHONY: vtn
-vtn: ; sudo docker build --rm -t ${VTN_IMAGE_NAME} -f Dockerfile.vtn ${BUILD_ARGS} .
diff --git a/containers/docker-compose.yml b/containers/docker-compose.yml
deleted file mode 100644
index 24596a3..0000000
--- a/containers/docker-compose.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-xos_db:
-    image: xosproject/xos-postgres
-    expose:
-        - "5432"
-
-xos_synchronizer_openstack:
-    command: bash -c "sleep 120; python /opt/xos/synchronizers/openstack/xos-synchronizer.py"
-    image: xosproject/xos-synchronizer-openstack
-    labels:
-        org.xosproject.kind: synchronizer
-        org.xosproject.target: openstack
-    links:
-        - xos_db
-    volumes:
-        - .:/root/setup:ro
-
-# FUTURE
-#xos_swarm_synchronizer:
-#    image: xosproject/xos-swarm-synchronizer
-#    labels:
-#        org.xosproject.kind: synchronizer
-#        org.xosproject.target: swarm
-
-xos:
-    command: python /opt/xos/manage.py runserver 0.0.0.0:8000 --insecure --makemigrations
-    image: xosproject/xos
-    links:
-        - xos_db
-    ports:
-        - "8000:8000"
-    volumes:
-        - .:/root/setup:ro
diff --git a/containers/elk/README.md b/containers/elk/README.md
deleted file mode 100644
index 676e718..0000000
--- a/containers/elk/README.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# XOS ELK Stack Containers
-
-## Introduction
-
-ELK Stack is comprised of 3 core services:
-
-  * A Elasticsearch database backend
-  * A Logstash log collector 
-  * A Kibana front end
-
-We have created separate dockerfiles for each of these services, making it
-easier to build and deploy the services independently.
-
-#### Elasticsearch
-
-To build the Elasticsearch container:
-
-```
-$ cd elasticsearch; make build && make run
-```
-
-#### Logstash
-
-To build the Logstash container:
-
-```
-$ cd logstash; make build && make run
-```
-
-#### Kibana
-
-To build the Kibana container:
-
-```
-$ cd kibana; make build && make run
-```
-
-### Forwarding logs to Logstash
-
-Now that we have elk stack setup we need to start sending it some log files to process. We've provided a logstash-forwarder container that can be deployed on any host that has log files which you would like to have processed. 
-
-#### Logstash-forwarder
-
-The logstash-forwarder container is configured to mount the /var/log/ directory of the host machine, which means all files in /var/log are visible to the container. Modify the "files" section conf/config.json to include the files you want logstash-forwarder to handle. 
-
-You can modify the mount options in the Makefile if you need to access files that live in a directory other than /var/log/.
-
-To build the Loststash-forwarder container
-
-```
-$ cd logstash-forwarder; make build && make run
-```
-
diff --git a/containers/elk/elasticsearch/Dockerfile b/containers/elk/elasticsearch/Dockerfile
deleted file mode 100644
index 33206b8..0000000
--- a/containers/elk/elasticsearch/Dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-FROM ubuntu:14.04.2
-
-RUN echo "deb http://packages.elastic.co/elasticsearch/1.7/debian stable main" | sudo tee -a /etc/apt/sources.list.d/elasticsearch-1.7.list
-
-RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y --force-yes\
-    openjdk-7-jre-headless \
-    wget \
-    elasticsearch
-
-VOLUME ["/data"]
-
-ADD conf/elasticsearch.yml /etc/elasticsearch/elasticsearch.yml
-ADD conf/elasticsearch.yml /usr/share/elasticsearch/config
-
-WORKDIR /data
-
-# Expose ports.
-#   - 9200: HTTP
-#   - 9300: transport
-EXPOSE 9200
-EXPOSE 9300     
-
-CMD ["/usr/share/elasticsearch/bin/elasticsearch"]
diff --git a/containers/elk/elasticsearch/Makefile b/containers/elk/elasticsearch/Makefile
deleted file mode 100644
index 9b01b93..0000000
--- a/containers/elk/elasticsearch/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-.PHONY: build
-build: ; docker build --rm -t elasticsearch .
-
-.PHONY: run
-run: ; docker run -d -p 9200:9200 --name elasticsearch_server elasticsearch
-
-.PHONY: stop
-stop: ; docker stop elasticsearch_server
-
-.PHONY: rmcontainer
-rmcontainer: ; docker rm elasticsearch_server
diff --git a/containers/elk/elasticsearch/conf/elasticsearch.yml b/containers/elk/elasticsearch/conf/elasticsearch.yml
deleted file mode 100644
index 72be0f9..0000000
--- a/containers/elk/elasticsearch/conf/elasticsearch.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-path:
-  data: /data/data
-  logs: /data/log
-  plugins: /data/plugins
-  work: /data/work
diff --git a/containers/elk/kibana/Dockerfile b/containers/elk/kibana/Dockerfile
deleted file mode 100644
index fcfe625..0000000
--- a/containers/elk/kibana/Dockerfile
+++ /dev/null
@@ -1,37 +0,0 @@
-FROM ubuntu:14.04.2
-
-ENV KIBANA_VERSION kibana-4.0.1-linux-x64
-ENV KIBANA_SECURE true
-ENV KIBANA_USER kibana
-ENV KIBANA_PASSWORD kibana
-
-RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y \
-    wget \ 
-    nginx-full \
-    apache2-utils \
-    supervisor
-
-WORKDIR /opt
-
-RUN wget --no-check-certificate -O- https://download.elasticsearch.org/kibana/kibana/${KIBANA_VERSION}.tar.gz | tar xvfz -
-
-RUN mkdir /etc/kibana # This is where the htpasswd file is placed by the run script
-
-ADD conf/kibana /etc/nginx/sites-available/kibana
-
-ADD conf/kibana-secure /etc/nginx/sites-available/kibana-secure
-
-RUN rm /etc/nginx/sites-enabled/*
-
-RUN echo "daemon off;" >> /etc/nginx/nginx.conf
-
-ADD conf/supervisord.conf /etc/supervisor/conf.d/kibana.conf
-
-ADD run_kibana /opt/${KIBANA_VERSION}/run_kibana
-
-RUN chmod +x /opt/${KIBANA_VERSION}/run_kibana
-
-EXPOSE 80
-EXPOSE 5601
-
-CMD /opt/${KIBANA_VERSION}/run_kibana
diff --git a/containers/elk/kibana/Makefile b/containers/elk/kibana/Makefile
deleted file mode 100644
index c44491a..0000000
--- a/containers/elk/kibana/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-.PHONY: build
-build: ; docker build --rm -t kibana .
-
-.PHONY: run
-run: ; docker run -d --link elasticsearch_server:elasticsearch -p 8000:80 -e KIBANA_SECURE=false --name kibana_server kibana
-
-.PHONY: runsecure
-runsecure: ; docker run -d --link elasticsearch_server:elasticsearch -p 5601:80  --name kibana_server kibana
-
-.PHONY: stop
-stop: ; docker stop kibana_server
-
-.PHONY: rmcontainer
-rmcontainer: ; docker rm kibana_server
diff --git a/containers/elk/kibana/conf/kibana b/containers/elk/kibana/conf/kibana
deleted file mode 100644
index c5c3031..0000000
--- a/containers/elk/kibana/conf/kibana
+++ /dev/null
@@ -1,17 +0,0 @@
-server {
-  listen   80; ## listen for ipv4; this line is default and implied
-  listen   [::]:80 default ipv6only=on; ## listen for ipv6
-
-  # Make site accessible from http://localhost/
-  server_name localhost;
-
-  location = /health {
-    return 200;
-    access_log off;
-  }
-
-  location / {
-    proxy_pass http://kibana:5601;
-    proxy_read_timeout 90;
-  }
-}
diff --git a/containers/elk/kibana/conf/kibana-secure b/containers/elk/kibana/conf/kibana-secure
deleted file mode 100644
index 760f161..0000000
--- a/containers/elk/kibana/conf/kibana-secure
+++ /dev/null
@@ -1,24 +0,0 @@
-server {
-  listen   80; ## listen for ipv4; this line is default and implied
-  listen   [::]:80 default ipv6only=on; ## listen for ipv6
-
-  # Make site accessible from http://localhost/
-  server_name localhost;
-
-  location = /health {
-    return 200;
-    access_log off;
-  }
-
-  location / {
-    proxy_pass http://kibana:5601;
-    proxy_read_timeout 90;
-
-    if ($http_x_forwarded_proto != "https") {
-      rewrite ^ https://$host$uri permanent;
-    }
-
-    auth_basic "Restricted";
-    auth_basic_user_file /etc/kibana/htpasswd;
-  }
-}
diff --git a/containers/elk/kibana/conf/supervisord.conf b/containers/elk/kibana/conf/supervisord.conf
deleted file mode 100644
index deff0c7..0000000
--- a/containers/elk/kibana/conf/supervisord.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[supervisord]
-nodaemon=true
-
-[program:kibana]
-command=/opt/kibana-4.0.1-linux-x64/bin/kibana
-autorestart=true
-stderr_logfile=/var/log/supervisor/kibana.err.log
-stdout_logfile=/var/log/supervisor/kibana.out.log
-
-[program:nginx]
-command=/usr/sbin/nginx
-autorestart=true
-stderr_logfile=/var/log/supervisor/nginx.err.log
-stdout_logfile=/var/log/supervisor/nginx.out.log
diff --git a/containers/elk/kibana/run_kibana b/containers/elk/kibana/run_kibana
deleted file mode 100644
index 8723bba..0000000
--- a/containers/elk/kibana/run_kibana
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-sed -i "s/localhost:9200/elasticsearch:9200/g" /opt/${KIBANA_VERSION}/config/kibana.yml
-if [ "$KIBANA_SECURE" = "true" ] ; then
-    ln -s /etc/nginx/sites-available/kibana-secure /etc/nginx/sites-enabled/kibana
-    htpasswd -bc /etc/kibana/htpasswd ${KIBANA_USER} ${KIBANA_PASSWORD}
-else
-    ln -s /etc/nginx/sites-available/kibana /etc/nginx/sites-enabled/kibana
-fi
-sed -i "s/kibana:5601/$HOSTNAME:5601/g" /etc/nginx/sites-enabled/kibana
-/usr/bin/supervisord -c /etc/supervisor/conf.d/kibana.conf
diff --git a/containers/elk/logstash-forwarder/Dockerfile b/containers/elk/logstash-forwarder/Dockerfile
deleted file mode 100644
index 05979c9..0000000
--- a/containers/elk/logstash-forwarder/Dockerfile
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM ubuntu:14.04.2
-
-ENV LOGSTASH_HOST 66.228.36.77
-
-RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y --force-yes \
-    git \
-    golang \
-    supervisor
-
-RUN git clone git://github.com/elasticsearch/logstash-forwarder.git /tmp/logstash-forwarder
-RUN cd /tmp/logstash-forwarder && git checkout v0.4.0 && go build
-
-RUN mkdir /opt/logstash-forwarder && cp /tmp/logstash-forwarder/logstash-forwarder /opt/logstash-forwarder/logstash-forwarder
-
-ADD conf/config.json /opt/logstash-forwarder/config.json
-ADD conf/supervisord.conf /etc/supervisor/conf.d/logstash-forwarder.conf
-ADD run_logstash-forwarder /opt/logstash-forwarder/run_logstash-forwarder
-
-RUN chmod +x /opt/logstash-forwarder/run_logstash-forwarder
-
-RUN rm -rf /tmp/*
-
-VOLUME ["/opt/certs", "/var/log/"]
-
-CMD /opt/logstash-forwarder/run_logstash-forwarder
-
-
diff --git a/containers/elk/logstash-forwarder/Makefile b/containers/elk/logstash-forwarder/Makefile
deleted file mode 100644
index cc52790..0000000
--- a/containers/elk/logstash-forwarder/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-.PHONY: build
-build: ; docker build --rm -t logstash-forwarder .
-
-.PHONY: run
-run: ; docker run --rm -v `pwd`/../logstash/certs:/opt/certs -v /var/log/:/var/log --name logstash-forwarder_server -i -t logstash-forwarder
-
-.PHONY: stop
-stop: ; docker stop logstash-forwarder_server 
-
-.PHONY: rmcontainer
-rmcontainer: ; docker rm logstash-forwarder_server 
diff --git a/containers/elk/logstash-forwarder/conf/config.json b/containers/elk/logstash-forwarder/conf/config.json
deleted file mode 100644
index 71a9975..0000000
--- a/containers/elk/logstash-forwarder/conf/config.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "network": {
-    "servers": [ "logstash:5043" ],
-    "ssl certificate": "/opt/certs/logstash-forwarder.crt",
-    "ssl key": "/opt/certs/logstash-forwarder.key",
-    "ssl ca": "/opt/certs/logstash-forwarder.crt",
-    "timeout": 15
-  },
-  "files": [
-    {
-      "paths": [ "/var/log/message", "/var/log/syslog" ],
-      "fields": { "type": "stdin" }
-    }
-  ]
-}
diff --git a/containers/elk/logstash-forwarder/conf/supervisord.conf b/containers/elk/logstash-forwarder/conf/supervisord.conf
deleted file mode 100644
index c91b37c..0000000
--- a/containers/elk/logstash-forwarder/conf/supervisord.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[supervisord]
-nodaemon=true
-
-[program:logstash-forwarder]
-command=/opt/logstash-forwarder/logstash-forwarder -config /opt/logstash-forwarder/config.json 
-autorestart=true
-stderr_logfile=/var/log/logstash.err.log
-stdout_logfile=/var/log/logstash.out.log
-
diff --git a/containers/elk/logstash-forwarder/extfile.cnf b/containers/elk/logstash-forwarder/extfile.cnf
deleted file mode 100644
index 337a5f4..0000000
--- a/containers/elk/logstash-forwarder/extfile.cnf
+++ /dev/null
@@ -1 +0,0 @@
-subjectAltName = IP:66.228.36.77
diff --git a/containers/elk/logstash-forwarder/run_logstash-forwarder b/containers/elk/logstash-forwarder/run_logstash-forwarder
deleted file mode 100644
index e97edc4..0000000
--- a/containers/elk/logstash-forwarder/run_logstash-forwarder
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-sed -i "s/logstash:5043/${LOGSTASH_HOST}:5043/g" /opt/logstash-forwarder/config.json
-
-/usr/bin/supervisord -c /etc/supervisor/conf.d/logstash-forwarder.conf
diff --git a/containers/elk/logstash/Dockerfile b/containers/elk/logstash/Dockerfile
deleted file mode 100644
index 2c9ad7b..0000000
--- a/containers/elk/logstash/Dockerfile
+++ /dev/null
@@ -1,26 +0,0 @@
-FROM ubuntu:14.04.2
-
-RUN echo "deb http://packages.elasticsearch.org/logstash/1.5/debian stable main" | sudo tee -a /etc/apt/sources.list
-
-RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y --force-yes \
-    wget \
-    ca-certificates \
-    openjdk-7-jre-headless \
-    supervisor \
-    logstash
-
-
-
-RUN mkdir /opt/logstash/plugins
-ADD conf/supervisord.conf /etc/supervisor/conf.d/logstash.conf
-ADD conf/logstash.conf /opt/logstash/logstash.conf
-ADD conf/collectd-types.db /opt/logstash/collectd-types.db
-ADD conf/filter_rsyslog.conf /etc/logstash/plugins/filter_rsyslog.conf
-
-VOLUME ["/opt/logstash/certs"]
-
-EXPOSE 514
-EXPOSE 5043
-EXPOSE 9292
-
-CMD /usr/bin/supervisord -c /etc/supervisor/conf.d/logstash.conf
diff --git a/containers/elk/logstash/Makefile b/containers/elk/logstash/Makefile
deleted file mode 100644
index 9e04234..0000000
--- a/containers/elk/logstash/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-IP=`curl icanhazip.com`
-IP=66.228.36.77
-SUBJECT="/C=US/ST=NY/O=Internet Widgits Pty Ltd/subjectAltName=IP:${IP}"
-
-.PHONY: certs
-certs: ; [ ! -d certs  ] && mkdir certs && cd certs && openssl req -x509 -batch -nodes -newkey rsa:2048 -keyout logstash-forwarder.key -out logstash-forwarder.crt
-
-.PHONY: build
-build: ; docker build --rm -t logstash .
-
-.PHONY: run
-run: ; docker run -d --link elasticsearch_server:elasticsearch -p 5043:5043 -p 514:514 -v `pwd`/certs:/opt/logstash/certs -v `pwd`/conf:/opt/logstash/conf --name logstash_server -i -t logstash
-
-.PHONY: stop
-stop: ; docker stop logstash_server 
-
-.PHONY: rmcontainer
-rmcontainer: ; docker rm logstash_server
diff --git a/containers/elk/logstash/certs/logstash-forwarder.crt b/containers/elk/logstash/certs/logstash-forwarder.crt
deleted file mode 100644
index 1ecccc4..0000000
--- a/containers/elk/logstash/certs/logstash-forwarder.crt
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDbjCCAlagAwIBAgIJAKAHY7+C/K7gMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV
-BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
-aWRnaXRzIFB0eSBMdGQwHhcNMTUwOTA1MjMyNDQ3WhcNMTUxMDA1MjMyNDQ3WjBF
-MQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50
-ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA2/e7hjfGFSp5EqB2Su4ZHNHABxInxoPGpl7Yn3jnDH/RmrXWyUcAyrVm
-DTDUZ38NQ0LORFuuyR6EdHoBiD4KEzzP8fMpqTdviyhbqDB2Ijc2FsFLKlHB4zIb
-E8JpBoBKl49Mk9Hhb0y/Ce1vjYdhUW1kgo0icvabtX9rTzweyogZC/EEBS6yz4rx
-CG1VwGWplpBioMSJkzaWQgqpoOLf6L5GaiXjuYgFdYBv4DpY+HoySJvIdYKAOgGy
-a84KQCv5Syx5BNgq/Tk6MX3dCGRheI6BLmZuu5Zpm7EY/dWTbHzTcuT/NhGUhqR7
-G0BPQfYRkfvkrdUIOWFPJdVJDz5NwQIDAQABo2EwXzAPBgNVHREECDAGhwRC5CRN
-MB0GA1UdDgQWBBS6sPxnCknyoMFBAKoo9FT59a0WfzAfBgNVHSMEGDAWgBS6sPxn
-CknyoMFBAKoo9FT59a0WfzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IB
-AQAw2oy3fDa1PuRueeWaEERtRysgVR/Z41GrOxkSW/wnbI2kxIMvnMFXCsfqgfof
-MStVdfP0ZgqNbnVFgbQ4egbgcH6qfpTPpNGxz4C//od24+T6nQWVWuujiSpmQF8e
-sv1HXT6HduYvQAl1II0UaZ0LZBTgP0P7O4Em7gjtMVWdnscdj+qFzZnY187HUchr
-+ngjUa5uJtVgKtX+a0oEh24EmUdQbEB+2wEwV7zJoA9k8WUHY7QxCpIMBD5b9aLs
-C27t0J8mBmPv3C9pEfJiRKdq/fhiwxuZWqXfIuLo8oTZJOcceLnLvxaMXpAilKva
-HK0aeVmnOiey6bbwddE6hr6R
------END CERTIFICATE-----
diff --git a/containers/elk/logstash/certs/logstash-forwarder.key b/containers/elk/logstash/certs/logstash-forwarder.key
deleted file mode 100644
index 40d3dfa..0000000
--- a/containers/elk/logstash/certs/logstash-forwarder.key
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDb97uGN8YVKnkS
-oHZK7hkc0cAHEifGg8amXtifeOcMf9GatdbJRwDKtWYNMNRnfw1DQs5EW67JHoR0
-egGIPgoTPM/x8ympN2+LKFuoMHYiNzYWwUsqUcHjMhsTwmkGgEqXj0yT0eFvTL8J
-7W+Nh2FRbWSCjSJy9pu1f2tPPB7KiBkL8QQFLrLPivEIbVXAZamWkGKgxImTNpZC
-Cqmg4t/ovkZqJeO5iAV1gG/gOlj4ejJIm8h1goA6AbJrzgpAK/lLLHkE2Cr9OTox
-fd0IZGF4joEuZm67lmmbsRj91ZNsfNNy5P82EZSGpHsbQE9B9hGR++St1Qg5YU8l
-1UkPPk3BAgMBAAECggEBAMF+8LSmh1bDH/HkuWo8fFa/o/4UWGzmKm7bbA8MWaLD
-JWzEnIY+MVIfs//SfmX0e4Q5Vh0H0X8Vm0qisIpamJ5HllytnG5AV5zACbCvwJtk
-me32Ztp5ROdIgk0lbSHM5NDhu2kk7PvtNPfUp5aGCnOImSvGXxFmIZ7M0WbH6gYZ
-hNuMCIWiTYjNVHLgl59vU55cz2Ze8a2lAqLD0UcvQtUDceqfxakBES7WcsmxSV24
-v5WheID0jX1BGkkSKZYkg+CagBGvoMei6HudkQz7xZnS27u2xrsGKi7zOMIC6cu4
-O+okPk+XHd9uleeb4klWFGx3w8HtXfEhY683jqUIeEkCgYEA86VEBamZ/FXi+vfw
-J7gyKtHUDwOrjU9pRTnZ0m1iRfbVYcR03egA9YWq4KhRp1l9Ofb1+3dCynaEyJXu
-d3vayQhKvRN2QymvETP2+3dXIdhqjgrhjRn0cZkWivTmjz20GnVvQ2X2wSNIl1tS
-B5Ym+v/G71HfAAuX+UD/FSQ017cCgYEA5x8bdRd58tg1zksnR2D5JCMvYiNVySar
-L1Z580dt6Ak0LwSWmZbGfaWAGPcBRbFGJSZCJ0AtlOCiIvDO1pdQ1UuVaknbrGEE
-rOr92/yd8CiWvbBzxjUJ3UXayy9q0iJuIt6tUaXlJDIOtxOXqYuRkb3kfnNSjDsc
-d/fhn+bZVkcCgYEA81zvPcyzf4V2TAIdgj8M9RJTg4/B6ksYtknblcEmeQXdC2PE
-6+YSFyuli/L0ZHkRiTVxa/Uq5LpPVV/VKsmutkCvDn8DEIDxWfiSyYjhom/dtvWN
-Z3g2XsVv6+pE5WzXmdoVAbg2KaKJno1buTI0y19yoJchbJUn/pL6d26Lza8CgYEA
-mrqNpEdSQg0TgId5xWSbhuDzYO0tClyT8D4hqIgigVxgDjYxKKPzQLzi1FPRCzpS
-Lp69XQ+vNGNqyJ+Uqb9lw1Y1spG9ulq9SZKM35Dwn45c1KNj7sclUnjosGyPRBz+
-xON0/xtkG2ZTyacZOs2QaBTL+wfztKQCPCK8b1OaHxMCgYAjz/psH+XbdcK/hFUk
-Ndh68Odw7pydVaIXg3woa4yDlbl5Ca69+P0sSwYYdDNKum6VEiclXlZOdhK/Pzx1
-D/KIPlOwcVcvx1Yog+eF/bZ/aDZj5uBfFDodNk0ohlwnw/2naOtOmYrbgviFznEb
-5P2U3UcClITRrgY9pc4VuFsz5Q==
------END PRIVATE KEY-----
diff --git a/containers/elk/logstash/conf/collectd-types.db b/containers/elk/logstash/conf/collectd-types.db
deleted file mode 100644
index ec6ff93..0000000
--- a/containers/elk/logstash/conf/collectd-types.db
+++ /dev/null
@@ -1,191 +0,0 @@
-absolute        value:ABSOLUTE:0:U
-apache_bytes        value:DERIVE:0:U
-apache_connections  value:GAUGE:0:65535
-apache_idle_workers value:GAUGE:0:65535
-apache_requests     value:DERIVE:0:U
-apache_scoreboard   value:GAUGE:0:65535
-ath_nodes       value:GAUGE:0:65535
-ath_stat        value:DERIVE:0:U
-bitrate         value:GAUGE:0:4294967295
-bytes           value:GAUGE:0:U
-cache_eviction      value:DERIVE:0:U
-cache_operation     value:DERIVE:0:U
-cache_ratio     value:GAUGE:0:100
-cache_result        value:DERIVE:0:U
-cache_size      value:GAUGE:0:4294967295
-charge          value:GAUGE:0:U
-compression_ratio   value:GAUGE:0:2
-compression     uncompressed:DERIVE:0:U, compressed:DERIVE:0:U
-connections     value:DERIVE:0:U
-conntrack       value:GAUGE:0:4294967295
-contextswitch       value:DERIVE:0:U
-counter         value:COUNTER:U:U
-cpufreq         value:GAUGE:0:U
-cpu         value:DERIVE:0:U
-current_connections value:GAUGE:0:U
-current_sessions    value:GAUGE:0:U
-current         value:GAUGE:U:U
-delay           value:GAUGE:-1000000:1000000
-derive          value:DERIVE:0:U
-df_complex      value:GAUGE:0:U
-df_inodes       value:GAUGE:0:U
-df          used:GAUGE:0:1125899906842623, free:GAUGE:0:1125899906842623
-disk_latency        read:GAUGE:0:U, write:GAUGE:0:U
-disk_merged     read:DERIVE:0:U, write:DERIVE:0:U
-disk_octets     read:DERIVE:0:U, write:DERIVE:0:U
-disk_ops_complex    value:DERIVE:0:U
-disk_ops        read:DERIVE:0:U, write:DERIVE:0:U
-disk_time       read:DERIVE:0:U, write:DERIVE:0:U
-dns_answer      value:DERIVE:0:U
-dns_notify      value:DERIVE:0:U
-dns_octets      queries:DERIVE:0:U, responses:DERIVE:0:U
-dns_opcode      value:DERIVE:0:U
-dns_qtype_cached    value:GAUGE:0:4294967295
-dns_qtype       value:DERIVE:0:U
-dns_query       value:DERIVE:0:U
-dns_question        value:DERIVE:0:U
-dns_rcode       value:DERIVE:0:U
-dns_reject      value:DERIVE:0:U
-dns_request     value:DERIVE:0:U
-dns_resolver        value:DERIVE:0:U
-dns_response        value:DERIVE:0:U
-dns_transfer        value:DERIVE:0:U
-dns_update      value:DERIVE:0:U
-dns_zops        value:DERIVE:0:U
-email_check     value:GAUGE:0:U
-email_count     value:GAUGE:0:U
-email_size      value:GAUGE:0:U
-entropy         value:GAUGE:0:4294967295
-fanspeed        value:GAUGE:0:U
-file_size       value:GAUGE:0:U
-files           value:GAUGE:0:U
-fork_rate       value:DERIVE:0:U
-frequency       value:GAUGE:0:U
-frequency_offset    value:GAUGE:-1000000:1000000
-fscache_stat        value:DERIVE:0:U
-gauge           value:GAUGE:U:U
-hash_collisions     value:DERIVE:0:U
-http_request_methods    value:DERIVE:0:U
-http_requests       value:DERIVE:0:U
-http_response_codes value:DERIVE:0:U
-humidity        value:GAUGE:0:100
-if_collisions       value:DERIVE:0:U
-if_dropped      rx:DERIVE:0:U, tx:DERIVE:0:U
-if_errors       rx:DERIVE:0:U, tx:DERIVE:0:U
-if_multicast        value:DERIVE:0:U
-if_octets       rx:DERIVE:0:U, tx:DERIVE:0:U
-if_packets      rx:DERIVE:0:U, tx:DERIVE:0:U
-if_rx_errors        value:DERIVE:0:U
-if_tx_errors        value:DERIVE:0:U
-invocations     value:DERIVE:0:U
-io_octets       rx:DERIVE:0:U, tx:DERIVE:0:U
-io_packets      rx:DERIVE:0:U, tx:DERIVE:0:U
-ipt_bytes       value:DERIVE:0:U
-ipt_packets     value:DERIVE:0:U
-irq         value:DERIVE:0:U
-latency         value:GAUGE:0:65535
-links           value:GAUGE:0:U
-load            shortterm:GAUGE:0:100, midterm:GAUGE:0:100, longterm:GAUGE:0:100
-md_disks        value:GAUGE:0:U
-memcached_command   value:DERIVE:0:U
-memcached_connections   value:GAUGE:0:U
-memcached_items     value:GAUGE:0:U
-memcached_octets    rx:DERIVE:0:U, tx:DERIVE:0:U
-memcached_ops       value:DERIVE:0:U
-memory          value:GAUGE:0:281474976710656
-multimeter      value:GAUGE:U:U
-mutex_operations    value:DERIVE:0:U
-mysql_commands      value:DERIVE:0:U
-mysql_handler       value:DERIVE:0:U
-mysql_locks     value:DERIVE:0:U
-mysql_log_position  value:DERIVE:0:U
-mysql_octets        rx:DERIVE:0:U, tx:DERIVE:0:U
-nfs_procedure       value:DERIVE:0:U
-nginx_connections   value:GAUGE:0:U
-nginx_requests      value:DERIVE:0:U
-node_octets     rx:DERIVE:0:U, tx:DERIVE:0:U
-node_rssi       value:GAUGE:0:255
-node_stat       value:DERIVE:0:U
-node_tx_rate        value:GAUGE:0:127
-operations      value:DERIVE:0:U
-percent         value:GAUGE:0:100.1
-pg_blks         value:DERIVE:0:U
-pg_db_size      value:GAUGE:0:U
-pg_n_tup_c      value:DERIVE:0:U
-pg_n_tup_g      value:GAUGE:0:U
-pg_numbackends      value:GAUGE:0:U
-pg_scan         value:DERIVE:0:U
-pg_xact         value:DERIVE:0:U
-ping_droprate       value:GAUGE:0:100
-ping            value:GAUGE:0:65535
-ping_stddev     value:GAUGE:0:65535
-players         value:GAUGE:0:1000000
-power           value:GAUGE:0:U
-protocol_counter    value:DERIVE:0:U
-ps_code         value:GAUGE:0:9223372036854775807
-ps_count        processes:GAUGE:0:1000000, threads:GAUGE:0:1000000
-ps_cputime      user:DERIVE:0:U, syst:DERIVE:0:U
-ps_data         value:GAUGE:0:9223372036854775807
-ps_disk_octets      read:DERIVE:0:U, write:DERIVE:0:U
-ps_disk_ops     read:DERIVE:0:U, write:DERIVE:0:U
-ps_pagefaults       minflt:DERIVE:0:U, majflt:DERIVE:0:U
-ps_rss          value:GAUGE:0:9223372036854775807
-ps_stacksize        value:GAUGE:0:9223372036854775807
-ps_state        value:GAUGE:0:65535
-ps_vm           value:GAUGE:0:9223372036854775807
-queue_length        value:GAUGE:0:U
-records         value:GAUGE:0:U
-requests        value:GAUGE:0:U
-response_time       value:GAUGE:0:U
-route_etx       value:GAUGE:0:U
-route_metric        value:GAUGE:0:U
-routes          value:GAUGE:0:U
-serial_octets       rx:DERIVE:0:U, tx:DERIVE:0:U
-signal_noise        value:GAUGE:U:0
-signal_power        value:GAUGE:U:0
-signal_quality      value:GAUGE:0:U
-snr         value:GAUGE:0:U
-spam_check      value:GAUGE:0:U
-spam_score      value:GAUGE:U:U
-swap_io         value:DERIVE:0:U
-swap            value:GAUGE:0:1099511627776
-tcp_connections     value:GAUGE:0:4294967295
-temperature     value:GAUGE:-273.15:U
-threads         value:GAUGE:0:U
-time_dispersion     value:GAUGE:-1000000:1000000
-timeleft        value:GAUGE:0:3600
-time_offset     value:GAUGE:-1000000:1000000
-total_bytes     value:DERIVE:0:U
-total_connections   value:DERIVE:0:U
-total_operations    value:DERIVE:0:U
-total_requests      value:DERIVE:0:U
-total_sessions      value:DERIVE:0:U
-total_threads       value:DERIVE:0:U
-total_time_in_ms    value:DERIVE:0:U
-total_values        value:DERIVE:0:U
-uptime          value:GAUGE:0:4294967295
-users           value:GAUGE:0:65535
-vcpu            value:GAUGE:0:U
-virt_cpu_total      value:DERIVE:0:U
-virt_vcpu       value:DERIVE:0:U
-vmpage_action       value:DERIVE:0:U
-vmpage_faults       minflt:DERIVE:0:U, majflt:DERIVE:0:U
-vmpage_io       in:DERIVE:0:U, out:DERIVE:0:U
-vmpage_number       value:GAUGE:0:4294967295
-volatile_changes    value:GAUGE:0:U
-voltage_threshold   value:GAUGE:U:U, threshold:GAUGE:U:U
-voltage         value:GAUGE:U:U
-vs_memory       value:GAUGE:0:9223372036854775807
-vs_processes        value:GAUGE:0:65535
-vs_threads      value:GAUGE:0:65535
-#
-# Legacy types
-# (required for the v5 upgrade target)
-#
-arc_counts      demand_data:COUNTER:0:U, demand_metadata:COUNTER:0:U, prefetch_data:COUNTER:0:U, prefetch_metadata:COUNTER:0:U
-arc_l2_bytes        read:COUNTER:0:U, write:COUNTER:0:U
-arc_l2_size     value:GAUGE:0:U
-arc_ratio       value:GAUGE:0:U
-arc_size        current:GAUGE:0:U, target:GAUGE:0:U, minlimit:GAUGE:0:U, maxlimit:GAUGE:0:U
-mysql_qcache        hits:COUNTER:0:U, inserts:COUNTER:0:U, not_cached:COUNTER:0:U, lowmem_prunes:COUNTER:0:U, queries_in_cache:GAUGE:0:U
-mysql_threads       running:GAUGE:0:U, connected:GAUGE:0:U, cached:GAUGE:0:U, created:COUNTER:0:U
diff --git a/containers/elk/logstash/conf/filter_rsyslog.conf b/containers/elk/logstash/conf/filter_rsyslog.conf
deleted file mode 100644
index d64be71..0000000
--- a/containers/elk/logstash/conf/filter_rsyslog.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-filter {
-  if [type] == “syslog” {
-    grok {
-      match => { "message" => "%{SYSLOGTIMESTAMP:syslog_timestamp} %{SYSLOGHOST:syslog_hostname} %{DATA:syslog_program}(?:\[%{POSINT:syslog_pid}\])?: %{GREEDYDATA:syslog_message}" }
-      add_field => [ "received_at", "%{@timestamp}" ]
-      add_field => [ "received_from", "%{host}" ]
-    }
-    syslog_pri { }
-    date {
-      match => [ “syslog_timestamp”, “MMM d HH:mm:ss”, “MMM dd HH:mm:ss” ]
-    }  
-  }
-}                                                            
diff --git a/containers/elk/logstash/conf/logstash.conf b/containers/elk/logstash/conf/logstash.conf
deleted file mode 100644
index 8d3f57c..0000000
--- a/containers/elk/logstash/conf/logstash.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-input {
-  syslog {
-    type => syslog
-    port => 514
-  }
-  lumberjack {
-    port => 5043
-    type => "logs"
-    ssl_certificate => "/opt/logstash/certs/logstash-forwarder.crt"
-    ssl_key => "/opt/logstash/certs/logstash-forwarder.key"
-  }
-  udp {
-    port => 25826
-    buffer_size => 1452
-    codec => collectd { }
-  }
-}
-output {
-
-stdout {
-    codec => json
-}
-
-elasticsearch {
-      host => "elasticsearch"
-      port => "9300"
-  }
-}
diff --git a/containers/elk/logstash/conf/supervisord.conf b/containers/elk/logstash/conf/supervisord.conf
deleted file mode 100644
index 1f3ede3..0000000
--- a/containers/elk/logstash/conf/supervisord.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-[supervisord]
-nodaemon=true
-
-[program:logstash
-command=/opt/logstash/bin/logstash -f /opt/logstash/logstash.conf -p /opt/logstash/plugins/  
-autorestart=true
-stderr_logfile=/var/log/logstash.err.log
-stdout_logfile=/var/log/logstash.out.log
diff --git a/containers/nagios/Dockerfile b/containers/nagios/Dockerfile
deleted file mode 100644
index c33f71c..0000000
--- a/containers/nagios/Dockerfile
+++ /dev/null
@@ -1,63 +0,0 @@
-FROM cpuguy83/ubuntu
-ENV NAGIOS_HOME /opt/nagios
-ENV NAGIOS_USER nagios
-ENV NAGIOS_GROUP nagios
-ENV NAGIOS_CMDUSER nagios
-ENV NAGIOS_CMDGROUP nagios
-ENV NAGIOSADMIN_USER nagiosadmin
-ENV NAGIOSADMIN_PASS nagios
-ENV APACHE_RUN_USER nagios
-ENV APACHE_RUN_GROUP nagios
-ENV NAGIOS_TIMEZONE UTC
-
-RUN sed -i 's/universe/universe multiverse/' /etc/apt/sources.list
-RUN apt-get update && apt-get install -y iputils-ping netcat build-essential snmp snmpd snmp-mibs-downloader php5-cli apache2 libapache2-mod-php5 runit bc postfix bsd-mailx
-RUN ( egrep -i  "^${NAGIOS_GROUP}" /etc/group || groupadd $NAGIOS_GROUP ) && ( egrep -i "^${NAGIOS_CMDGROUP}" /etc/group || groupadd $NAGIOS_CMDGROUP )
-RUN ( id -u $NAGIOS_USER || useradd --system $NAGIOS_USER -g $NAGIOS_GROUP -d $NAGIOS_HOME ) && ( id -u $NAGIOS_CMDUSER || useradd --system -d $NAGIOS_HOME -g $NAGIOS_CMDGROUP $NAGIOS_CMDUSER )
-
-ADD http://downloads.sourceforge.net/project/nagios/nagios-3.x/nagios-3.5.1/nagios-3.5.1.tar.gz?r=http%3A%2F%2Fwww.nagios.org%2Fdownload%2Fcore%2Fthanks%2F%3Ft%3D1398863696&ts=1398863718&use_mirror=superb-dca3 /tmp/nagios.tar.gz
-RUN cd /tmp && tar -zxvf nagios.tar.gz && cd nagios  && ./configure --prefix=${NAGIOS_HOME} --exec-prefix=${NAGIOS_HOME} --enable-event-broker --with-nagios-command-user=${NAGIOS_CMDUSER} --with-command-group=${NAGIOS_CMDGROUP} --with-nagios-user=${NAGIOS_USER} --with-nagios-group=${NAGIOS_GROUP} && make all && make install && make install-config && make install-commandmode && cp sample-config/httpd.conf /etc/apache2/conf.d/nagios.conf
-ADD http://www.nagios-plugins.org/download/nagios-plugins-1.5.tar.gz /tmp/
-RUN cd /tmp && tar -zxvf nagios-plugins-1.5.tar.gz && cd nagios-plugins-1.5 && ./configure --prefix=${NAGIOS_HOME} && make && make install
-
-RUN sed -i.bak 's/.*\=www\-data//g' /etc/apache2/envvars
-RUN export DOC_ROOT="DocumentRoot $(echo $NAGIOS_HOME/share)"; sed -i "s,DocumentRoot.*,$DOC_ROOT," /etc/apache2/sites-available/default
-
-RUN ln -s ${NAGIOS_HOME}/bin/nagios /usr/local/bin/nagios && mkdir -p /usr/share/snmp/mibs && chmod 0755 /usr/share/snmp/mibs && touch /usr/share/snmp/mibs/.foo
-
-RUN echo "use_timezone=$NAGIOS_TIMEZONE" >> ${NAGIOS_HOME}/etc/nagios.cfg && echo "SetEnv TZ \"${NAGIOS_TIMEZONE}\"" >> /etc/apache2/conf.d/nagios.conf
-
-RUN mkdir -p ${NAGIOS_HOME}/etc/conf.d && mkdir -p ${NAGIOS_HOME}/etc/monitor && ln -s /usr/share/snmp/mibs ${NAGIOS_HOME}/libexec/mibs
-RUN echo "cfg_dir=${NAGIOS_HOME}/etc/conf.d" >> ${NAGIOS_HOME}/etc/nagios.cfg
-RUN echo "cfg_dir=${NAGIOS_HOME}/etc/monitor" >> ${NAGIOS_HOME}/etc/nagios.cfg
-RUN download-mibs && echo "mibs +ALL" > /etc/snmp/snmp.conf
-
-RUN sed -i 's,/bin/mail,/usr/bin/mail,' /opt/nagios/etc/objects/commands.cfg && \
-  sed -i 's,/usr/usr,/usr,' /opt/nagios/etc/objects/commands.cfg
-RUN cp /etc/services /var/spool/postfix/etc/
-
-RUN mkdir -p /etc/sv/nagios && mkdir -p /etc/sv/apache && rm -rf /etc/sv/getty-5 && mkdir -p /etc/sv/postfix
-ADD nagios.init /etc/sv/nagios/run
-ADD apache.init /etc/sv/apache/run
-ADD postfix.init /etc/sv/postfix/run
-ADD postfix.stop /etc/sv/postfix/finish
-
-ADD start.sh /usr/local/bin/start_nagios
-
-# install slack alert notification plugin
-ADD slack_nagios.cfg ${NAGIOS_HOME}/etc/conf.d/slack_nagios.cfg
-ADD slack_nagios.sh  /usr/local/bin/slack_nagios.sh
-RUN chmod +x /usr/local/bin/slack_nagios.sh
-
-ENV APACHE_LOCK_DIR /var/run
-ENV APACHE_LOG_DIR /var/log/apache2
-
-EXPOSE 80
-
-VOLUME /opt/nagios/var
-VOLUME /opt/nagios/etc
-VOLUME /opt/nagios/libexec
-VOLUME /var/log/apache2
-VOLUME /usr/share/snmp/mibs
-
-CMD ["/usr/local/bin/start_nagios"]
diff --git a/containers/nagios/Makefile b/containers/nagios/Makefile
deleted file mode 100644
index 0c6cb32..0000000
--- a/containers/nagios/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-.PHONY: build
-	build: ; docker build --rm -t xosproject/nagios .
-
-.PHONY: run
-	run: ; docker run -d --name xosproject_nagios -p 8001:80 -t xosproject/nagios
-
-.PHONY: stop
-	stop: ; docker stop xosproject_nagios
-
-.PHONY: rm
-	rm: ; docker rm xosproject_nagios
-
diff --git a/containers/nagios/README.md b/containers/nagios/README.md
deleted file mode 100644
index e6c2c0e..0000000
--- a/containers/nagios/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-## Docker-Nagios  [![Docker Build Status](http://72.14.176.28/cpuguy83/nagios)](https://registry.hub.docker.com/u/cpuguy83/nagios)
-
-Basic Docker image for running Nagios.<br />
-This is running Nagios 3.5.1
-
-You should either link a mail container in as "mail" or set MAIL_SERVER, otherwise
-mail will not work.
-
-### Knobs ###
-- NAGIOSADMIN_USER=nagiosadmin
-- NAGIOSAMDIN_PASS=nagios
-
-### Web UI ###
-The Nagios Web UI is available on port 80 of the container<br />
diff --git a/containers/nagios/apache.init b/containers/nagios/apache.init
deleted file mode 100755
index 9cb9a38..0000000
--- a/containers/nagios/apache.init
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-. /etc/default/apache2
-
-exec /usr/sbin/apache2 -D FOREGROUND
diff --git a/containers/nagios/nagios.init b/containers/nagios/nagios.init
deleted file mode 100755
index 30448f9..0000000
--- a/containers/nagios/nagios.init
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-exec ${NAGIOS_HOME}/bin/nagios ${NAGIOS_HOME}/etc/nagios.cfg
diff --git a/containers/nagios/postfix.init b/containers/nagios/postfix.init
deleted file mode 100755
index 29bf50b..0000000
--- a/containers/nagios/postfix.init
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-: ${MAIL_SERVER=$MAIL_PORT_25_TCP_ADDR}
-
-
-sed -i "s/relayhost =.*/relayhost = ${MAIL_SERVER}/" /etc/postfix/main.cf
-sed -i "s/myhostname =.*/myhostname = `hostname`/" /etc/postfix/main.cf
-
-exec /usr/lib/postfix/master -d -c /etc/postfix
diff --git a/containers/nagios/postfix.stop b/containers/nagios/postfix.stop
deleted file mode 100755
index 50646e8..0000000
--- a/containers/nagios/postfix.stop
+++ /dev/null
@@ -1 +0,0 @@
-postfix stop
diff --git a/containers/nagios/slack_nagios.cfg b/containers/nagios/slack_nagios.cfg
deleted file mode 100644
index 8840c87..0000000
--- a/containers/nagios/slack_nagios.cfg
+++ /dev/null
@@ -1,21 +0,0 @@
-define contact {
-      contact_name                             slack
-      alias                                    Slack
-      service_notification_period              24x7
-      host_notification_period                 24x7
-      service_notification_options             w,u,c,r
-      host_notification_options                d,r
-      service_notification_commands            notify-service-by-slack
-      host_notification_commands               notify-host-by-slack
-}
-
-define command {
-      command_name     notify-service-by-slack
-      command_line     /usr/local/bin/slack_nagios.sh > /tmp/slack.log 2>&1
-}
-
-define command {
-      command_name     notify-host-by-slack
-      command_line     /usr/local/bin/slack_nagios.sh > /tmp/slack.log 2>&1
-}
-
diff --git a/containers/nagios/slack_nagios.sh b/containers/nagios/slack_nagios.sh
deleted file mode 100755
index 7c5e205..0000000
--- a/containers/nagios/slack_nagios.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-# This script is used by Nagios to post alerts into a Slack channel
-# using the Incoming WebHooks integration. Create the channel, botname
-# and integration first and then add this notification script in your
-# Nagios configuration.
-#
-# All variables that start with NAGIOS_ are provided by Nagios as
-# environment variables when an notification is generated.
-# A list of the env variables is available here:
-#   http://nagios.sourceforge.net/docs/3_0/macrolist.html
-#
-# More info on Slack
-# Website: https://slack.com/
-# Twitter: @slackhq, @slackapi
-#
-# My info
-# Website: http://matthewcmcmillan.blogspot.com/
-# Twitter: @matthewmcmillan
-
-#Modify these variables for your environment
-MY_NAGIOS_HOSTNAME=""        # This server's hostname
-SLACK_HOSTNAME=""               
-SLACK_CHANNEL="#alerts"      
-SLACK_BOTNAME="nagios"
-WEBHOOK_URL=""               # Incomming webhook url for the slack account 
-
-#Set the message icon based on Nagios service state
-if [ "$NAGIOS_SERVICESTATE" = "CRITICAL" ]
-then
-    ICON=":exclamation:"
-elif [ "$NAGIOS_SERVICESTATE" = "WARNING" ]
-then
-    ICON=":warning:"
-elif [ "$NAGIOS_SERVICESTATE" = "OK" ]
-then
-    ICON=":white_check_mark:"
-elif [ "$NAGIOS_SERVICESTATE" = "UNKNOWN" ]
-then
-    ICON=":question:"
-else
-    ICON=":white_medium_square:"
-fi
-
-#Send message to Slack
-curl -X POST --data-urlencode "payload={\"channel\": \"${SLACK_CHANNEL}\", \"username\": \"${SLACK_USERNAME}\", \"text\": \"${ICON} HOST: ${MY_NAGIOS_HOSTNAME}   SERVICE: ${NAGIOS_SERVICEDISPLAYNAME}     MESSAGE: ${NAGIOS_SERVICEOUTPUT} <https://${MY_NAGIOS_HOSTNAME}/cgi-bin/nagios3/extinfo.cgi?type=1&host=${NAGIOS_HOSTNAME}|See Nagios>\"}" $WEBHOOK_URL
diff --git a/containers/nagios/start.sh b/containers/nagios/start.sh
deleted file mode 100755
index f295e5b..0000000
--- a/containers/nagios/start.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-if [ ! -f ${NAGIOS_HOME}/etc/htpasswd.users ] ; then
-  htpasswd -c -b -s ${NAGIOS_HOME}/etc/htpasswd.users ${NAGIOSADMIN_USER} ${NAGIOSADMIN_PASS}
-  chown -R nagios.nagios ${NAGIOS_HOME}/etc/htpasswd.users
-fi
-
-exec runsvdir /etc/sv
-
-/etc/init.d/apache2 start
diff --git a/containers/onboarding_synchronizer/Dockerfile b/containers/onboarding_synchronizer/Dockerfile
deleted file mode 100644
index e17cfd0..0000000
--- a/containers/onboarding_synchronizer/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM xosproject/xos-synchronizer-openstack
-
-# Install docker-in-docker (dind). See https://hub.docker.com/_/docker/. The docker git repo
-# currently only has 1.10 and 1.11, but it's possible to get the dockerfiles for earlier
-# versions by using:
-#        docker pull centurylink/dockerfile-from-image
-#        alias dfimage="docker run -v /var/run/docker.sock:/var/run/docker.sock --rm centurylink/dockerfile-from-image"
-#        dgimage <name of image>
-
-# This container must be started in privileged mode.
-
-# Install docker
-ENV DOCKER_URL https://get.docker.com/builds/Linux/x86_64/docker-1.10.3
-ENV DOCKER_SHA256 d0df512afa109006a450f41873634951e19ddabf8c7bd419caeb5a526032d86d
-
-RUN curl -fLsS $DOCKER_URL -o docker && \
-    echo "${DOCKER_SHA256}  docker" | sha256sum -c - && \
-    mv docker /usr/local/bin/docker && \
-    chmod +x /usr/local/bin/docker
-
-# XXX uncomment the following 6 lines to run docker-in-docker
-#     comment them out if using the docker socket in a volume instead
-#ENV DIND_COMMIT=3b5fac462d21ca164b3778647420016315289034
-#RUN wget "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind" -O /usr/local/bin/dind && chmod +x /sr/local/bin/dind
-#COPY start-dockerd.sh /usr/local/bin/
-#VOLUME /var/lib/docker
-#EXPOSE 2375
-#ENTRYPOINT ["start-dockerd.sh"]
-
-# Instead of using docker-in-docker, we can just attach ourselves
-# to the docker socket via a volume in the docker-compose:
-#     - /var/run/docker.sock:/var/run/docker.sock
-# This is more convenient, allowing us to build directly into our
-# parent's docker build system, making the images available for
-# instantiation on the parent.
-
-# Install docker-compose
-ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/1.5.2/docker-compose-Linux-x86_64
-ENV DOCKER_COMPOSE_SHA256 b6b975badc5389647ef1c16fe8a33bdc5935c61f6afd5a15a28ff765427d01e3
-
-RUN curl -fLsS $DOCKER_COMPOSE_URL -o docker-compose && \
-    echo "${DOCKER_COMPOSE_SHA256}  docker-compose" | sha256sum -c - && \
-    mv docker-compose /usr/local/bin/docker-compose && \
-    chmod +x /usr/local/bin/docker-compose
-
-CMD /usr/bin/supervisord -c /etc/supervisor/conf.d/synchronizer.conf
diff --git a/containers/onboarding_synchronizer/Makefile b/containers/onboarding_synchronizer/Makefile
deleted file mode 100644
index c6d2a6b..0000000
--- a/containers/onboarding_synchronizer/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-IMAGE_NAME:=xosproject/xos-synchronizer-onboarding
-CONTAINER_NAME:=xos-synchronizer
-NO_DOCKER_CACHE?=false
-
-BUILD_ARGS =
-ifdef http_proxy
-BUILD_ARGS += --build-arg http_proxy=${http_proxy}
-endif
-ifdef https_proxy
-BUILD_ARGS += --build-arg https_proxy=${https_proxy}
-endif
-
-.PHONY: build
-build: ; sudo docker build --no-cache=${NO_DOCKER_CACHE} --rm -t ${IMAGE_NAME} ${BUILD_ARGS} .
-
-.PHONY: run
-run: ; sudo docker run -d --name ${CONTAINER_NAME} -v /usr/local/share/ca-certificates:/usr/local/share/ca-certificates:ro ${IMAGE_NAME}
-
-.PHONY: stop
-stop: ; sudo docker stop ${CONTAINER_NAME}
-
-.PHONY: rm
-rm: ; sudo docker rm ${CONTAINER_NAME}
diff --git a/containers/onboarding_synchronizer/start-dockerd.sh b/containers/onboarding_synchronizer/start-dockerd.sh
deleted file mode 100755
index bb97341..0000000
--- a/containers/onboarding_synchronizer/start-dockerd.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/bash
-
-docker daemon --host=unix:///var/run/docker.sock --host=tcp://0.0.0.0:2375 --storage-driver=aufs
diff --git a/containers/onos/Dockerfile b/containers/onos/Dockerfile
deleted file mode 100644
index d00b8e2..0000000
--- a/containers/onos/Dockerfile
+++ /dev/null
@@ -1,57 +0,0 @@
-FROM debian:jessie
-MAINTAINER Zack Williams <zdw@cs.arizona.edu>
-
-# Add Java 8 repository
-ENV DEBIAN_FRONTEND noninteractive
-RUN echo debconf shared/accepted-oracle-license-v1-1 select true | debconf-set-selections && \
-    echo "deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee /etc/apt/sources.list.d/webupd8team-java.list && \
-    echo "deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee -a /etc/apt/sources.list.d/webupd8team-java.list && \
-    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys EEA14886
-
-# Set the environment variables
-ENV HOME /root
-ENV JAVA_HOME /usr/lib/jvm/java-8-oracle
-ENV ONOS_ROOT /src/onos
-ENV KARAF_VERSION 3.0.5
-ENV KARAF_ROOT /root/onos/apache-karaf-3.0.5
-ENV KARAF_LOG /root/onos/apache-karaf-3.0.5/data/log/karaf.log
-ENV BUILD_NUMBER docker
-ENV PATH $PATH:$KARAF_ROOT/bin
-
-#Download and Build ONOS
-WORKDIR /src
-RUN     apt-get update && apt-get install -y python maven git curl oracle-java8-installer oracle-java8-set-default && \
-        git clone https://github.com/opennetworkinglab/onos.git && cd onos && \
-        git checkout f503a62372ffa55150936628689d1435109ffccb && \
-        mkdir -p /root/Downloads && \
-        mvn clean install && \
-        tools/build/onos-package && \
-        rm -rf /root/.m2 && cd .. && \
-        rm -rf onos && \
-        apt-get remove --purge -y `apt-mark showauto` && \
-        apt-get install oracle-java8-set-default -y && \
-        apt-get clean && apt-get purge -y && apt-get autoremove -y && \
-        rm -rf /var/lib/apt/lists/* && \
-        rm -rf /var/cache/oracle-jdk8-installer && \
-        rm -rf /root/Downloads
-
-# Change to /root directory
-WORKDIR /root
-
-#Install ONOS
-RUN mkdir onos && \
-   mv /tmp/onos-*.docker.tar.gz . && \
-   tar -xf onos-*.docker.tar.gz -C onos --strip-components=1 && \
-   rm -rf onos-*.docker.tar.gz
-
-# Ports
-# 6653 - OpenFlow
-# 8181 - GUI
-# 8101 - ONOS CLI
-# 9876 - ONOS CLUSTER COMMUNICATION
-EXPOSE 6653 8181 8101 9876
-
-# Get ready to run command
-WORKDIR /root/onos
-ENTRYPOINT ["./bin/onos-service"]
-
diff --git a/containers/onos/Makefile b/containers/onos/Makefile
deleted file mode 100644
index 19a9700..0000000
--- a/containers/onos/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-IMAGE_NAME:=xosproject/onos-fork
-CONTAINER_NAME:=onos-fork
-NO_DOCKER_CACHE?=false
-
-BUILD_ARGS =
-ifdef http_proxy
-BUILD_ARGS += --build-arg http_proxy=${http_proxy}
-endif
-ifdef https_proxy
-BUILD_ARGS += --build-arg https_proxy=${https_proxy}
-endif
-
-.PHONY: build
-build: ; sudo docker build --no-cache=${NO_DOCKER_CACHE} --rm -t ${IMAGE_NAME} ${BUILD_ARGS} .
-
-.PHONY: run
-run: ; sudo docker run -d --name ${CONTAINER_NAME} ${IMAGE_NAME}
-
-.PHONY: stop
-stop: ; sudo docker stop ${CONTAINER_NAME}
-
-.PHONY: rm
-rm: ; sudo docker rm ${CONTAINER_NAME}
diff --git a/containers/openvpn/Dockerfile b/containers/openvpn/Dockerfile
deleted file mode 100644
index 8ae8484..0000000
--- a/containers/openvpn/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM       xosproject/xos-synchronizer-openstack
-
-RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y \
-    openvpn
-
-# for OpenVPN
-RUN mkdir -p /opt/openvpn
-RUN chmod 777 /opt/openvpn
-RUN git clone https://github.com/OpenVPN/easy-rsa.git /opt/openvpn
-RUN git -C /opt/openvpn pull origin master
-RUN echo 'set_var EASYRSA	"/opt/openvpn/easyrsa3"' | tee /opt/openvpn/vars
-RUN echo 'set_var EASYRSA_BATCH	"true"' | tee -a /opt/openvpn/vars
diff --git a/containers/openvpn/Makefile b/containers/openvpn/Makefile
deleted file mode 100644
index bdfb126..0000000
--- a/containers/openvpn/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-IMAGE_NAME:=xosproject/xos-openvpn
-CONTAINER_NAME:=xos-synchronizer
-NO_DOCKER_CACHE?=true
-
-.PHONY: build
-build: ; sudo docker build --no-cache=${NO_DOCKER_CACHE} --rm -t ${IMAGE_NAME} .
-
-.PHONY: run
-run: ; sudo docker run -d --name ${CONTAINER_NAME} -v /usr/local/share/ca-certificates:/usr/local/share/ca-certificates:ro ${IMAGE_NAME}
-
-.PHONY: stop
-stop: ; sudo docker stop ${CONTAINER_NAME}
-
-.PHONY: rm
-rm: ; sudo docker rm ${CONTAINER_NAME}
-
-.PHONY: rmi
-rmi: ; docker rmi ${IMAGE_NAME}
diff --git a/containers/openvpn/conf/ansible-hosts b/containers/openvpn/conf/ansible-hosts
deleted file mode 100644
index 0dd74f1..0000000
--- a/containers/openvpn/conf/ansible-hosts
+++ /dev/null
@@ -1,2 +0,0 @@
-[localhost]
-127.0.0.1
diff --git a/containers/openvpn/conf/synchronizer.conf b/containers/openvpn/conf/synchronizer.conf
deleted file mode 100644
index 2131a25..0000000
--- a/containers/openvpn/conf/synchronizer.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[supervisord]
-logfile=/var/log/supervisord.log ; (main log file;default $CWD/supervisord.log)
-pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
-nodaemon=true
-
-[program:synchronizer]
-command=python /opt/xos/synchronizers/openstack/xos-synchronizer.py
-stderr_logfile=/var/log/supervisor/synchronizer.err.log
-stdout_logfile=/var/log/supervisor/synchronizer.out.log
diff --git a/containers/setup.yaml b/containers/setup.yaml
deleted file mode 100644
index c13f0eb..0000000
--- a/containers/setup.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: >
-    * Adds OpenCloud Sites, Deployments, and Controllers.
-
-imports:
-   - custom_types/xos.yaml
-
-topology_template:
-  node_templates:
-
-    MyDeployment:
-      type: tosca.nodes.Deployment
-      properties:
-          flavors: m1.large, m1.medium, m1.small
-
-    MyOpenStack:
-      type: tosca.nodes.Controller
-      requirements:
-          - deployment:
-              node: MyDeployment
-              relationship: tosca.relationships.ControllerDeployment
-      properties:
-          backend_type: OpenStack
-          version: Kilo
-          auth_url: { get_script_env: [ SELF, adminrc, OS_AUTH_URL, LOCAL_FILE] }
-          admin_user: { get_script_env: [ SELF, adminrc, OS_USERNAME, LOCAL_FILE] }
-          admin_password: { get_script_env: [ SELF, adminrc, OS_PASSWORD, LOCAL_FILE] }
-          admin_tenant: { get_script_env: [ SELF, adminrc, OS_TENANT_NAME, LOCAL_FILE] }
-          domain: Default
-      artifacts:
-          adminrc: /root/setup/admin-openrc.sh
-
-    mysite:
-      type: tosca.nodes.Site
-      properties:
-          display_name: MySite
-          site_url: http://xosproject.org/
-      requirements:
-          - deployment:
-               node: MyDeployment
-               relationship: tosca.relationships.SiteDeployment
-               requirements:
-                   - controller:
-                       node: MyOpenStack
-                       relationship: tosca.relationships.UsesController
-
-    # This user already exists in XOS with this password
-    # It's an example of how to create new users
-    padmin@vicci.org:
-      type: tosca.nodes.User
-      requirements:
-          - site:
-              node: mysite
-              relationship: tosca.relationships.MemberOfSite
-      properties:
-          is_admin: true
-          is_active: true
-          firstname: XOS
-          lastname: admin
-          password: letmein
diff --git a/containers/synchronizer/Dockerfile b/containers/synchronizer/Dockerfile
deleted file mode 100644
index 2f1e092..0000000
--- a/containers/synchronizer/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM       xosproject/xos
-
-# Supervisor
-COPY conf/synchronizer.conf /etc/supervisor/conf.d/
-
-CMD /usr/bin/supervisord -c /etc/supervisor/conf.d/synchronizer.conf
diff --git a/containers/synchronizer/Makefile b/containers/synchronizer/Makefile
deleted file mode 100644
index 352616a..0000000
--- a/containers/synchronizer/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-IMAGE_NAME:=xosproject/xos-synchronizer-openstack
-CONTAINER_NAME:=xos-synchronizer
-NO_DOCKER_CACHE?=false
-
-.PHONY: build
-build: ; sudo docker build --no-cache=${NO_DOCKER_CACHE} --rm -t ${IMAGE_NAME} .
-
-.PHONY: run
-run: ; sudo docker run -d --name ${CONTAINER_NAME} -v /usr/local/share/ca-certificates:/usr/local/share/ca-certificates:ro ${IMAGE_NAME}
-
-.PHONY: stop
-stop: ; sudo docker stop ${CONTAINER_NAME}
-
-.PHONY: rm
-rm: ; sudo docker rm ${CONTAINER_NAME}
diff --git a/containers/synchronizer/conf/ansible-hosts b/containers/synchronizer/conf/ansible-hosts
deleted file mode 100644
index 0dd74f1..0000000
--- a/containers/synchronizer/conf/ansible-hosts
+++ /dev/null
@@ -1,2 +0,0 @@
-[localhost]
-127.0.0.1
diff --git a/containers/synchronizer/conf/synchronizer.conf b/containers/synchronizer/conf/synchronizer.conf
deleted file mode 100644
index 2131a25..0000000
--- a/containers/synchronizer/conf/synchronizer.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[supervisord]
-logfile=/var/log/supervisord.log ; (main log file;default $CWD/supervisord.log)
-pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
-nodaemon=true
-
-[program:synchronizer]
-command=python /opt/xos/synchronizers/openstack/xos-synchronizer.py
-stderr_logfile=/var/log/supervisor/synchronizer.err.log
-stdout_logfile=/var/log/supervisor/synchronizer.out.log
diff --git a/containers/syndicate-ms/Dockerfile b/containers/syndicate-ms/Dockerfile
deleted file mode 100644
index e74db92..0000000
--- a/containers/syndicate-ms/Dockerfile
+++ /dev/null
@@ -1,51 +0,0 @@
-# Syndicate Metadata Server
-# See also https://github.com/syndicate-storage/syndicate-docker
-
-FROM ubuntu:14.04.4
-MAINTAINER Zack Williams <zdw@cs.arizona.edu>
-
-# vars
-ENV APT_KEY butler_opencloud_cs_arizona_edu_pub.gpg
-ENV MS_PORT 8080
-ENV GAE_SDK google_appengine_1.9.35.zip
-
-# Prep apt to be able to download over https
-RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y --force-yes\
-    apt-transport-https
-
-# copy over and trust https cert
-COPY butler.crt /usr/local/share/ca-certificates
-RUN update-ca-certificates
-
-# Install Syndicate MS
-COPY $APT_KEY /tmp/
-RUN apt-key add /tmp/$APT_KEY
-
-RUN echo "deb https://butler.opencloud.cs.arizona.edu/repos/release/syndicate syndicate main" > /etc/apt/sources.list.d/butler.list
-
-RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y --force-yes\
-    syndicate-core \
-    syndicate-ms \
-    wget \
-    unzip
-
-# setup syndicate user
-RUN groupadd -r syndicate && useradd -m -r -g syndicate syndicate
-USER syndicate
-ENV HOME /home/syndicate
-WORKDIR $HOME
-
-# setup GAE
-RUN wget -nv https://storage.googleapis.com/appengine-sdks/featured/$GAE_SDK
-RUN unzip -q $GAE_SDK
-
-# Expose the MS port
-EXPOSE $MS_PORT
-
-# Create a storage location
-RUN mkdir $HOME/datastore
-
-# run the MS under GAE
-CMD $HOME/google_appengine/dev_appserver.py --admin_host=0.0.0.0 --host=0.0.0.0 --storage_path=$HOME/datastore --skip_sdk_update_check=true /usr/src/syndicate/ms
-
-
diff --git a/containers/syndicate-ms/Makefile b/containers/syndicate-ms/Makefile
deleted file mode 100644
index 2c24afc..0000000
--- a/containers/syndicate-ms/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-IMAGE_NAME:=xosproject/syndicate-ms
-CONTAINER_NAME:=xos-syndicate-ms
-NO_DOCKER_CACHE?=false
-
-.PHONY: build
-build: ; docker build --no-cache=${NO_DOCKER_CACHE} --rm -t ${IMAGE_NAME} .
-
-.PHONY: run
-run: ; docker run -d -p 8080:8080 --name ${CONTAINER_NAME} ${IMAGE_NAME}
-
-.PHONY: stop
-stop: ; docker stop ${CONTAINER_NAME}
-
-.PHONY: rm
-rm: ; docker rm ${CONTAINER_NAME}
-
-.PHONY: rmi
-rmi: ; docker rmi ${IMAGE_NAME}
-
diff --git a/containers/syndicate-ms/butler.crt b/containers/syndicate-ms/butler.crt
deleted file mode 100644
index be60161..0000000
--- a/containers/syndicate-ms/butler.crt
+++ /dev/null
@@ -1,37 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIGgjCCBWqgAwIBAgIRAJ26ZC+oEixlqDU7+7cazpIwDQYJKoZIhvcNAQELBQAw
-djELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk1JMRIwEAYDVQQHEwlBbm4gQXJib3Ix
-EjAQBgNVBAoTCUludGVybmV0MjERMA8GA1UECxMISW5Db21tb24xHzAdBgNVBAMT
-FkluQ29tbW9uIFJTQSBTZXJ2ZXIgQ0EwHhcNMTYwMzIyMDAwMDAwWhcNMTkwMzIy
-MjM1OTU5WjCBqzELMAkGA1UEBhMCVVMxDjAMBgNVBBETBTg1NzIxMQswCQYDVQQI
-EwJBWjEPMA0GA1UEBxMGVHVjc29uMSIwIAYDVQQKExlUaGUgVW5pdmVyc2l0eSBv
-ZiBBcml6b25hMSAwHgYDVQQLExdDb21wdXRlciBTY2llbmNlICgwNDEyKTEoMCYG
-A1UEAxMfYnV0bGVyLm9wZW5jbG91ZC5jcy5hcml6b25hLmVkdTCCAiIwDQYJKoZI
-hvcNAQEBBQADggIPADCCAgoCggIBAKHUqBxVP6fvTm015n8hXfe53B2IHbMbkwCj
-6eqc2mak8PEVIoD1Ds2TlrvS6xWtFJfNdKlMTNQMh3dVjUC8xcB+OUdr1Q3qv9to
-qiUJC+kTnJNDtOqYqJzX9koH+tHD0zr5/cqyT4vLkJZJXiZ5NGKyHUeh9INTj/ZG
-yHHVrDiF5gUyNl7HrN53AMPpJAxO0rurN5tI3ozK8TE60sslVdxE5zWwnSGazS+0
-hcz7uIyDTpyuo8H6iA/F5L5/USLqAYHLTk10Hg/7vnbRMbaz6sdXPFm+gtZPm5mG
-L2P9I4GM6L/TBXL7+etUtPAgVMoYrdDGZ3wmWOrWukD6ax3BVaX+dJxFNUTju2MZ
-1By6nJIzBBezHE7j4dhjRDaGwsxmdvEjn8weoeWS8ngT3fnm6btFgzO0O2CC3QN9
-M6pk5kJGm8kyhcc8nX4gv/Tkl1gHAd9VNgEJPY3YFXWigtjK7fSYGe9GDQsploUG
-OubK5S8eelSej1u9XW/NgqdxwgQWmxeppWxSwWb4wVyunVX03UHFmk6XnSdtF54E
-iy8VIuItRYyZGni8gAyCx8z6ke2zd8+wWgzsjxQ3dHjbLFxV1O57ZyNyb8TuZ5hk
-0QoJqdR0X6EXc+z4+tV+yYQGQZ5L3vgz7REp3TnlgG8acp3JfZpH8gng05cX6sBi
-I+NbZEmPAgMBAAGjggHTMIIBzzAfBgNVHSMEGDAWgBQeBaN3j2yW4luHS6a0hqxx
-AAznODAdBgNVHQ4EFgQUDfCqsiaVDm70iLaq32jUEmKr9pIwDgYDVR0PAQH/BAQD
-AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-MGcGA1UdIARgMF4wUgYMKwYBBAGuIwEEAwEBMEIwQAYIKwYBBQUHAgEWNGh0dHBz
-Oi8vd3d3LmluY29tbW9uLm9yZy9jZXJ0L3JlcG9zaXRvcnkvY3BzX3NzbC5wZGYw
-CAYGZ4EMAQICMEQGA1UdHwQ9MDswOaA3oDWGM2h0dHA6Ly9jcmwuaW5jb21tb24t
-cnNhLm9yZy9JbkNvbW1vblJTQVNlcnZlckNBLmNybDB1BggrBgEFBQcBAQRpMGcw
-PgYIKwYBBQUHMAKGMmh0dHA6Ly9jcnQudXNlcnRydXN0LmNvbS9JbkNvbW1vblJT
-QVNlcnZlckNBXzIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51c2VydHJ1
-c3QuY29tMCoGA1UdEQQjMCGCH2J1dGxlci5vcGVuY2xvdWQuY3MuYXJpem9uYS5l
-ZHUwDQYJKoZIhvcNAQELBQADggEBACUaI/yYc0pxAuwIWi0985f06MdKEMJo+qEO
-YLXENApQrJhTPdV9OaChlzI4x2ExmffPZEmhyD0q7z57mT9QkBYQwEJqwbRqfY2v
-0iQ4nLLkyXh7SJSS7J4WSG+cFEN1nFZ8/YGg/TD8spEIPeUGsUvRoJmJm9z90uqd
-+ETDc+79TZHxserOY3AJtlvzPScJa1HAqgDJGzgwGdUn82+bKZF5WGsGbfwUS6uS
-Ua2SsOxVZOn5ukF2g9vYs3dcO8u5ITAWrR1s6ACg/wGxvfvXwazpeiFx/RxilpcV
-6W7mTwbE76ZbkafrXbnZ6ihhIPARsVJhJsnClnf5OM7IqrX5g80=
------END CERTIFICATE-----
diff --git a/containers/syndicate-ms/butler_opencloud_cs_arizona_edu_pub.gpg b/containers/syndicate-ms/butler_opencloud_cs_arizona_edu_pub.gpg
deleted file mode 100644
index 92a2ae4..0000000
--- a/containers/syndicate-ms/butler_opencloud_cs_arizona_edu_pub.gpg
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1
-
-mQINBFb+uuwBEADgmbb2CPnQ2LofLdx5rJN4O75TAjYjJAPyyyIZL2bKmhhuRYwK
-a/gZAlOy5Y/4o5pRgG5s1BFkrSvWRIP+Y3D+PHz7wppjlo31NGm4+34stzlzGu4K
-EEUZpCiUiD1tCxX/H9jZTo5Dm2YvdLxnkWSkbf1ZkIzwNjM3bnYily2a/1NwMmqt
-18Hsy+3ivvUEZO0FmO2reP1l7Eb0hLR2QPxSA4/PxQ81+EJ3CObRYaUZ9KjgIRah
-eyP+PsXaFnxkoikGHod9ll2iWPzpkOUh+xXAu73YK4ikCrIUZ5Oe98Euja8h856H
-xiRRLGVL3iqzgAQJxG/0cXbiobN7bNYGlvLLyp+qRNbmgSYonsJxON4aVG+wjiLi
-gYCOQ/FQT0tYGeDprPBWRj6iGiic6K7W9BDXkxPqlYIYomMrjrqW5kX0YGMp+V7c
-2QG3yfh4+3pfpM+ZYfrAtCdgklYmCYBhoaieMrjIYw31PWqMuzxeb3xBS6++6ksH
-d9TlJKLgJ1UPiKLgDOEyIbYVWhPs2sQoRRstuKfPF9Gdv0UUAnqlyA8siVrvZfB2
-7D05PM4mv83GshoZ8ZAkV7uS6PFJIg6JM11dUM50LTfvHe7ig93CBvbFzm+RqxjQ
-JYf1XWd19912TW7NcNz6lg5jxEYLh8WYJin2xC2aLLb+hpy5NHE/Ien2aQARAQAB
-tCVPcGVuQ2xvdWQgQnV0bGVyIDxzaXRlc0BvcGVuY2xvdWQudXM+iQI9BBMBCgAn
-BQJW/rrsAhsDBQkDwmcABQsJCAcDBRUKCQgLBRYDAgEAAh4BAheAAAoJELvMx3QD
-/Cyyc2UQAIw2A8qrNMQt4skrR/87uKQjfJ/OXC7MEBDTLSL0Ed0VIuRrA/E1s1D/
-YJpdsFfKJyDbZ2Id25L+1QclvEjnsEDCIiURGcRmXLLsqjHCw4N2C16P2JasQVWo
-i1lkqUHC8kCzvR75u+agzpn16Qhb8FqLQxBSxd8vhMEw2LnrjRsjHGwErKhpYfOg
-LFXyurKKBb4KYOLortICgcE3Wz6eqgbNInrTMrSOSf5P7nsPINCFTyemzUyT53IU
-07RmJwTOrcgqJR5klghHQnFXJBkB55EMvFLjUrL4dpnAmlbkKhyFX8aRsBD5Frt2
-93LkHWDa35SELEzfIQznIsfok1rHgDR8kAh7m+tEbmn/Qk3llJ7c/r4JqG0RVGfe
-OfYZDT4I12H6ZWIoLjktnAP4QlDf+olILEYAD0PvKEQU7sQpMmex5QBMt6vvGAj6
-RfPn1iFhUZdOPB7GyWtUn8hmBCEfLAoAAntgoW9NC+PI/chFrm6Nugjz60TbMMOd
-i4s5J998AuJeF2RJogIi61a4VYcprSMTkF5b8kxBhV4N4J5jJQEQxo3ztdw7USvj
-ce8/3/69mBT7rIXgk39FvqnSIz9SmyQ+wgLb94Gcpy1id64yab2P1LNm3pORafSN
-F59uVqgEv5W2g/frt5QMSBO06dvzNjStIV7/uxlOHuSNooIClr//
-=JFDF
------END PGP PUBLIC KEY BLOCK-----