Merge branch 'master' of github.com:open-cloud/xos
diff --git a/Dockerfile b/Dockerfile
index af13eb4..6ea3239 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,21 +1,28 @@
FROM ubuntu:14.04.1
MAINTAINER Andy Bavier <acb@cs.princeton.edu>
+# XXX Workaround for docker bug:
+# https://github.com/docker/docker/issues/6345
+# Kernel 3.15 breaks docker, uss the line below as a workaround
+# until there is a fix
+RUN ln -s -f /bin/true /usr/bin/chfn
+# XXX End workaround
+
# Install.
RUN apt-get update
-RUN apt-get install -y git
-RUN apt-get install -y postgresql
-RUN apt-get install -y python-psycopg2
-RUN apt-get install -y graphviz graphviz-dev
-RUN apt-get install -y libxslt1.1 libxslt1-dev
-RUN apt-get install -y python-pip
-RUN apt-get install -y tar
-RUN apt-get install -y gcc
-RUN apt-get install -y python-httplib2
-RUN apt-get install -y geoip-database libgeoip1
-RUN apt-get install -y wget
-RUN apt-get install -y python-dev
-RUN apt-get install -y libyaml-dev
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y git
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y postgresql
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y python-psycopg2
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y graphviz graphviz-dev
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y libxslt1.1 libxslt1-dev
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y python-pip
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y tar
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y gcc
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y python-httplib2
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y geoip-database libgeoip1
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y wget
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y python-dev
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y libyaml-dev
RUN pip install django==1.7
RUN pip install djangorestframework==2.4.4
@@ -37,22 +44,22 @@
RUN pip install django-encrypted-fields
RUN pip install python-keyczar
-RUN apt-get install -y python-keystoneclient
-RUN apt-get install -y python-novaclient
-RUN apt-get install -y python-neutronclient
-RUN apt-get install -y python-glanceclient
-RUN apt-get install -y python-ceilometerclient
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y python-keystoneclient
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y python-novaclient
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y python-neutronclient
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y python-glanceclient
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y python-ceilometerclient
RUN pip install django_rest_swagger
-RUN apt-get install -y python-setuptools
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y python-setuptools
RUN easy_install django_evolution
RUN easy_install python_gflags
RUN easy_install google_api_python_client
# Set up latest Ansible
# Need to add our patches too
-RUN apt-get install -y ansible
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y ansible
# RUN git clone --recursive git://github.com/ansible/ansible.git /opt/ansible
ADD ansible-hosts /etc/ansible/hosts
diff --git a/planetstack/core/migrations/0001_initial.py b/planetstack/core/migrations/0001_initial.py
index ad82329..fe34224 100644
--- a/planetstack/core/migrations/0001_initial.py
+++ b/planetstack/core/migrations/0001_initial.py
@@ -103,7 +103,6 @@
('admin_user', models.CharField(help_text=b'Username of an admin user at this controller', max_length=200, null=True, blank=True)),
('admin_password', models.CharField(help_text=b'Password of theadmin user at this controller', max_length=200, null=True, blank=True)),
('admin_tenant', models.CharField(help_text=b'Name of the tenant the admin user belongs to', max_length=200, null=True, blank=True)),
- ('domain', models.CharField(help_text=b'Name of the domain this controller belongs to', max_length=200, null=True, blank=True)),
],
options={
'abstract': False,
diff --git a/planetstack/openstack_observer/run_ansible b/planetstack/openstack_observer/run_ansible
old mode 100644
new mode 100755