Revert a couple more files that I changed for debugging
diff --git a/containers/syndicate-ms/Makefile b/containers/syndicate-ms/Makefile
index 2c24afc..5a32a7e 100644
--- a/containers/syndicate-ms/Makefile
+++ b/containers/syndicate-ms/Makefile
@@ -1,6 +1,6 @@
IMAGE_NAME:=xosproject/syndicate-ms
CONTAINER_NAME:=xos-syndicate-ms
-NO_DOCKER_CACHE?=false
+NO_DOCKER_CACHE?=true
.PHONY: build
build: ; docker build --no-cache=${NO_DOCKER_CACHE} --rm -t ${IMAGE_NAME} .
@@ -16,4 +16,3 @@
.PHONY: rmi
rmi: ; docker rmi ${IMAGE_NAME}
-
diff --git a/containers/xos/Dockerfile b/containers/xos/Dockerfile
index d17b2a2..5c81aa8 100644
--- a/containers/xos/Dockerfile
+++ b/containers/xos/Dockerfile
@@ -34,7 +34,8 @@
python-novaclient \
python-neutronclient \
python-glanceclient \
- python-ceilometerclient
+ python-ceilometerclient \
+ openvpn
RUN pip install \
django==1.7 \
diff --git a/containers/xos/Makefile b/containers/xos/Makefile
index 1103407..cf91988 100644
--- a/containers/xos/Makefile
+++ b/containers/xos/Makefile
@@ -3,7 +3,7 @@
TOSCA_CONFIG_PATH:=/opt/xos/configurations/opencloud/opencloud.yaml
XOS_GIT_REPO?=git://github.com/open-cloud/xos.git
XOS_GIT_BRANCH?=master
-NO_DOCKER_CACHE?=true
+NO_DOCKER_CACHE?=false
.PHONY: build
build: ; sudo docker build --no-cache=${NO_DOCKER_CACHE} --rm -t ${IMAGE_NAME} .
diff --git a/xos/configurations/common/Dockerfile.common b/xos/configurations/common/Dockerfile.common
index 1189808..aedd245 100644
--- a/xos/configurations/common/Dockerfile.common
+++ b/xos/configurations/common/Dockerfile.common
@@ -28,8 +28,7 @@
python-dev \
libyaml-dev \
pkg-config \
- python-pycurl \
- openvpn
+ python-pycurl
RUN pip install django==1.7
RUN pip install djangorestframework==2.4.4
@@ -132,19 +131,6 @@
RUN pip install python-dateutil
RUN bash /opt/xos/tosca/install_tosca.sh
-# for OpenVPN
-RUN mkdir -p /opt/openvpn
-RUN git clone https://github.com/OpenVPN/easy-rsa.git /opt/openvpn
-RUN git -C /opt/openvpn pull origin master
-RUN cp /opt/xos/services/vpn/vars /opt/openvpn/vars
-RUN source /opt/openvpn/vars
-RUN /opt/openvpn/clean-all
-RUN /opt/openvpn/build-ca --batch
-RUN /opt/openvpn/build-key-server --batch server
-RUN /opt/openvpn/build-dh
-RUN chmod 777 /opt/openvpn/keys/server.key
-RUN chmod 777 /opt/openvpn/keys/dh2048.pem
-
EXPOSE 8000
# Set environment variables.
diff --git a/xos/configurations/devel/docker-compose.yml b/xos/configurations/devel/docker-compose.yml
index 018193d..9ef6fc7 100644
--- a/xos/configurations/devel/docker-compose.yml
+++ b/xos/configurations/devel/docker-compose.yml
@@ -34,5 +34,3 @@
volumes:
- ../setup:/root/setup:ro
- ../common/xos_common_config:/opt/xos/xos_configuration/xos_common_config:ro
- volumes_from:
- - xos_synchronizer_vpn_data:rw
diff --git a/xos/xos/settings.py b/xos/xos/settings.py
index 2bd3f2c..ec6055b 100644
--- a/xos/xos/settings.py
+++ b/xos/xos/settings.py
@@ -30,7 +30,7 @@
GEOIP_PATH = "/usr/share/GeoIP"
XOS_DIR = "/opt/xos"
-DEBUG = True
+DEBUG = False
TEMPLATE_DEBUG = DEBUG
ADMINS = (