Merge branch 'master' of github.com:open-cloud/xos
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..7d279c5
--- /dev/null
+++ b/README.md
@@ -0,0 +1,14 @@
+## Getting Started with XOS and CORD
+
+For a general introduction to XOS and how it is used in CORD, see
+http://guide.xosproject.org. The "Developer Guide" at that URL is
+especially helpful, although it is sync'ed with the previous
+release (currently Burwell), which likely lags what's in master.
+Additional design notes, presentations, and other collateral are
+also available at http://xosproject.org.
+
+The quickest way to get started is to look at the collection of
+"stock" configurations in *xos/configurations*. The *cord*
+configuration in that directory corresponds to our current
+CORD development environment, and the README you'll find there
+will help you get started.
diff --git a/containers/postgresql/Makefile b/containers/postgresql/Makefile
index 38f159c..c50923e 100644
--- a/containers/postgresql/Makefile
+++ b/containers/postgresql/Makefile
@@ -1,5 +1,5 @@
-IMAGE_NAME:=xosproject/xos-postgress
-CONTAINER_NAME:=xos-db-postgress
+IMAGE_NAME:=xosproject/xos-postgres
+CONTAINER_NAME:=xos-db-postgres
NO_DOCKER_CACHE?=false
.PHONY: build
diff --git a/containers/xos-compose.yml b/containers/xos-compose.yml
index 27a3b5a..464b560 100644
--- a/containers/xos-compose.yml
+++ b/containers/xos-compose.yml
@@ -1,5 +1,5 @@
xos_db:
- image: xosproject/xos-postgress
+ image: xosproject/xos-postgres
expose:
- "5432"
diff --git a/containers/xos/Dockerfile b/containers/xos/Dockerfile
index 37bd55b..38e08a1 100644
--- a/containers/xos/Dockerfile
+++ b/containers/xos/Dockerfile
@@ -47,7 +47,7 @@
django-geoposition \
django-ipware \
django_rest_swagger \
- django-suit \
+ django-suit==0.3a1 \
django-timezones \
djangorestframework==2.4.4 \
dnslib \
diff --git a/containers/xos/Dockerfile.templ b/containers/xos/Dockerfile.templ
index e669692..5071f68 100644
--- a/containers/xos/Dockerfile.templ
+++ b/containers/xos/Dockerfile.templ
@@ -47,7 +47,7 @@
django-geoposition \
django-ipware \
django_rest_swagger \
- django-suit \
+ django-suit==0.3a1 \
django-timezones \
djangorestframework==2.4.4 \
dnslib \
diff --git a/xos/configurations/common/Makefile.devstack b/xos/configurations/common/Makefile.devstack
index 9d745a0..2f31696 100644
--- a/xos/configurations/common/Makefile.devstack
+++ b/xos/configurations/common/Makefile.devstack
@@ -1,7 +1,7 @@
# This shouldn't be hardcoded
DEVSTACK_ROOT:=~/devstack
-all: prereqs admin-openrc nodes_yaml public_key private_key ceilometer_url node_key
+all: prereqs admin-openrc flat_name nodes_yaml public_key private_key ceilometer_url node_key
prereqs:
make -f Makefile.prereqs
@@ -10,6 +10,10 @@
bash ./devstack-creds.sh $(DEVSTACK_ROOT) > admin-openrc.sh
touch controller_settings
+flat_name:
+ echo private|tr -d '\n' > flat_net_name
+ bash -c "source admin-openrc.sh; openstack network set --share private"
+
nodes_yaml:
bash ./make-cloudlab-nodes-yaml.sh