Merge branch 'master' of github.com:jermowery/xos into AddVPNService
diff --git a/containers/postgresql/Makefile b/containers/postgresql/Makefile
index c50923e..8f483f8 100644
--- a/containers/postgresql/Makefile
+++ b/containers/postgresql/Makefile
@@ -14,7 +14,7 @@
.PHONY: rm
rm: ; docker rm ${CONTAINER_NAME}
-.PHONE: rmi
+.PHONY: rmi
rmi: ; docker rmi ${IMAGE_NAME}
.PHONY: backup
diff --git a/views/style/README.md b/views/style/README.md
index 51f314e..7086fd9 100644
--- a/views/style/README.md
+++ b/views/style/README.md
@@ -1,9 +1,28 @@
# XOS Styles
-Collection of commands to work on xos styling.
+This folder holds style definition for XOS and a collection of tools usefull to work with them.
-> _Require to install dependencies with `npm install` before usage_
+## Setup
-`npm start` run BrowserSync and `node-sass` in watch mode.
+The best way to work with XOS styling and appearance is to have the `frontend` configuration running locally on your machine. In this way most of the GUI files are shared (see below). To use the provided tools as they are XOS should be available at `http://xos.dev:9999`.
->NOTE _Require XOS to respond on `http:xos.dev:999`_
\ No newline at end of file
+Before start working on the UI you should also install the dependencies, so enter `xos/views/style/` and execute `npm install` (NodeJs is required).
+
+## Developing
+
+When your environment is ready you could start it with `npm start`, this command will:
+ - Whatch styles in `xos/views/style/sass` and compile them on change
+ - Reload the broser on file changes (for more details see `xos/views/style/bs-config.js`)
+
+## Shared files:
+Shared files are defined in `xos/configurations/frontend/docker-compose.yml`, for the `frontend` configuration they are:
+```
+ - ../common/xos_common_config:/opt/xos/xos_configuration/xos_common_config
+ - ../../core/xoslib:/opt/xos/core/xoslib
+ - ../../core/static:/opt/xos/core/static
+ - ../../core/dashboard:/opt/xos/core/dashboard
+ - ../../core/templatetags:/opt/xos/core/templatetags
+ - ../../templates/admin:/opt/xos/templates/admin
+ - ../../configurations:/opt/xos/configurations
+ - ../../xos:/opt/xos/xos
+```
diff --git a/xos/configurations/common/devstack/local.conf b/xos/configurations/common/devstack/local.conf
index ea70675..15a95fb 100644
--- a/xos/configurations/common/devstack/local.conf
+++ b/xos/configurations/common/devstack/local.conf
@@ -6,7 +6,7 @@
#IMAGE_URLS+="http://www.vicci.org/cord/ceilometer-trusty-server-multi-nic.compressed.qcow2"
LIBVIRT_FIREWALL_DRIVER=nova.virt.firewall.NoopFirewallDriver
# Append the git branch name if you wish to download ceilometer from a specific branch
-enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer
+#enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer
disable_service n-net
enable_service q-svc
@@ -26,7 +26,7 @@
#enable_service ceilometer-alarm-evaluator
#enable_service ceilometer-api
#enable_service ceilometer-acompute
-CEILOMETER_BACKEND=mongodb
+#CEILOMETER_BACKEND=mongodb
## Neutron options
Q_USE_SECGROUP=False
diff --git a/xos/configurations/common/devstack/setup-devstack.sh b/xos/configurations/common/devstack/setup-devstack.sh
new file mode 100644
index 0000000..bfbb8f8
--- /dev/null
+++ b/xos/configurations/common/devstack/setup-devstack.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# If running on a CloudLab node, set up extra disk space
+if [ -e /usr/testbed/bin/mkextrafs ]
+then
+ sudo mkdir -p /opt/stack
+ sudo /usr/testbed/bin/mkextrafs -f /opt/stack
+fi
+
+cd ~
+git clone https://github.com/open-cloud/xos.git
+git clone https://git.openstack.org/openstack-dev/devstack
+cd ~/devstack
+git checkout stable/kilo
+cp ~/xos/xos/configurations/common/devstack/local.conf .
+./stack.sh