Remove some stuff from the XOS master configuration
diff --git a/containers/synchronizer/Makefile b/containers/synchronizer/Makefile
index 733e7b8..352616a 100644
--- a/containers/synchronizer/Makefile
+++ b/containers/synchronizer/Makefile
@@ -1,6 +1,6 @@
IMAGE_NAME:=xosproject/xos-synchronizer-openstack
CONTAINER_NAME:=xos-synchronizer
-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/containers/syndicate-ms/Makefile b/containers/syndicate-ms/Makefile
index 5a32a7e..d651609 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?=true
+NO_DOCKER_CACHE?=false
.PHONY: build
build: ; docker build --no-cache=${NO_DOCKER_CACHE} --rm -t ${IMAGE_NAME} .
diff --git a/containers/xos/Dockerfile b/containers/xos/Dockerfile
index 780e900..b5064ae 100644
--- a/containers/xos/Dockerfile
+++ b/containers/xos/Dockerfile
@@ -34,8 +34,7 @@
python-novaclient \
python-neutronclient \
python-glanceclient \
- python-ceilometerclient \
- openvpn
+ python-ceilometerclient
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} .