Install VPN
diff --git a/xos/configurations/devel/Dockerfile.devel b/xos/configurations/devel/Dockerfile.devel
index 60c0143..dff8c0c 100644
--- a/xos/configurations/devel/Dockerfile.devel
+++ b/xos/configurations/devel/Dockerfile.devel
@@ -5,6 +5,7 @@
ADD xos/configurations/common/cloudlab-nodes.yaml /opt/xos/configurations/commmon/
ADD xos/configurations/common/id_rsa.pub /root/setup/padmin_public_key
ADD xos/configurations/common/id_rsa /opt/xos/observers/helloworldservice_complete/helloworldservice_private_key
+ADD xos/configurations/common/id_rsa /opt/xos/observers/vpn/vpn_private_key
ADD xos/configurations/common/node_key.pub /root/setup/node_key.pub
ADD xos/configurations/common/node_key /root/setup/node_key
ADD xos/configurations/common/ceilometer_url /root/setup/ceilometer_url
diff --git a/xos/observers/vpn/helloworldservice_config b/xos/observers/vpn/helloworldservice_config
deleted file mode 100644
index 8165ae1..0000000
--- a/xos/observers/vpn/helloworldservice_config
+++ /dev/null
@@ -1,23 +0,0 @@
-# Required by XOS
-[db]
-name=xos
-user=postgres
-password=password
-host=localhost
-port=5432
-
-# Required by XOS
-[api]
-nova_enabled=True
-
-# Sets options for the observer
-[observer]
-name=vpn
-dependency_graph=/opt/xos/observers/vpn/model-deps
-steps_dir=/opt/xos/observers/vpn/steps
-sys_dir=/opt/xos/observers/vpn/sys
-logfile=/var/log/xos_backend.log
-pretend=False
-backoff_disabled=True
-save_ansible_output=True
-proxy_ssh=False
diff --git a/xos/scripts/opencloud b/xos/scripts/opencloud
index 6b3e737..966ad9b 100755
--- a/xos/scripts/opencloud
+++ b/xos/scripts/opencloud
@@ -60,13 +60,13 @@
echo Waiting for postgres to start
sleep 1
sudo -u postgres psql -c '\q'
- done
+ done
}
function db_exists {
- sudo -u postgres psql $DBNAME -c '\q' 2>/dev/null
+ sudo -u postgres psql $DBNAME -c '\q' 2>/dev/null
return $?
-}
+}
function createdb {
wait_postgres
@@ -145,6 +145,7 @@
python ./manage.py makemigrations cord
python ./manage.py makemigrations ceilometer
python ./manage.py makemigrations helloworldservice_complete
+ python ./manage.py makemigrations vpn
python ./manage.py makemigrations onos
#python ./manage.py makemigrations servcomp
}
diff --git a/xos/xos/settings.py b/xos/xos/settings.py
index b8dea14..cf2412f 100644
--- a/xos/xos/settings.py
+++ b/xos/xos/settings.py
@@ -8,8 +8,8 @@
GEOIP_PATH = "/usr/share/GeoIP"
XOS_DIR = "/opt/xos"
-
-DEBUG = False
+
+DEBUG = False
TEMPLATE_DEBUG = DEBUG
ADMINS = (
@@ -132,7 +132,7 @@
# Always use forward slashes, even on Windows.
# Don't forget to use absolute paths, not relative paths.
XOS_DIR + "/templates",
- XOS_DIR + "/core/xoslib/templates",
+ XOS_DIR + "/core/xoslib/templates",
)
INSTALLED_APPS = (
@@ -155,6 +155,7 @@
'hpc',
'cord',
'helloworldservice_complete',
+ 'vpn',
'services.onos',
'ceilometer',
'requestrouter',
@@ -172,7 +173,7 @@
INSTALLED_APPS.remove('django_evolution')
INSTALLED_APPS = tuple(INSTALLED_APPS)
-# Added for django-suit form
+# Added for django-suit form
TEMPLATE_CONTEXT_PROCESSORS = TCP + (
'django.core.context_processors.request',
'core.context_processors.xos',
@@ -198,7 +199,7 @@
# 'MENU_OPEN_FIRST_CHILD': True, # Default True
'MENU_EXCLUDE': (
'auth.group',
- 'auth',
+ 'auth',
'core.network',
'core.instance',
'core.node',
@@ -286,4 +287,3 @@
# prevents warnings on django 1.7
TEST_RUNNER = 'django.test.runner.DiscoverRunner'
-