commit cf1f9c8ea97031dd504d0a5b604d438b7ae06d6c
author Zack Williams <zdw@cs.arizona.edu> Tue Nov 08 22:19:02 2016 -0700
committer Zack Williams <zdw@cs.arizona.edu> Tue Nov 22 06:29:57 2016 -0700
tree 55f1ad2f41612eddbb03b4c798044e73857f78ec
parent f5d2b29f1e0b41fb6dee23faf804b0a0318fd498

unify bootstrap
remove image downloading
add admin_openrc.sh to docker-compose-bootstrap.yml for cord-pod
remove Tosca generated in platform-install
move more Tosca to platform-install
reinclude needed fabric config file
clarify relationship between making nodes and vtn config
whitespace
sleep as required to hack around management network not coming up
pauses moved to Makefile
dedicated, separate openstack configuration file

Change-Id: I78f4ce0121480fa6ef1509f5ff416b203b7d6013

cord-pod/docker-compose-bootstrap.yml

diff --git a/cord-pod/docker-compose-bootstrap.yml b/cord-pod/docker-compose-bootstrap.yml
index f0d87ca..6223fcb 100644
--- a/cord-pod/docker-compose-bootstrap.yml
+++ b/cord-pod/docker-compose-bootstrap.yml
@@ -5,6 +5,10 @@
 
 xos_redis:
     image: redis
+    log_driver: "json-file"
+    log_opt:
+            max-size: "1000k"
+            max-file: "5"
 
 xos_synchronizer_onboarding:
     image: xosproject/xos
@@ -23,28 +27,9 @@
         - ../../xos_libraries:/opt/xos_libraries
     log_driver: "json-file"
     log_opt:
-            max-size: "100k"
+            max-size: "1000k"
             max-file: "5"
 
-#xos_synchronizer_openstack:
-#    command: bash -c "sleep 120; python /opt/xos/synchronizers/openstack/xos-synchronizer.py"
-#    image: xosproject/xos-synchronizer-openstack
-#    labels:
-#        org.xosproject.kind: synchronizer
-#        org.xosproject.target: openstack
-#    links:
-#        - xos_db
-#    volumes:
-#        - ../common/xos_common_config:/opt/xos/xos_configuration/xos_common_config:ro
-#        - ./xos_cord_config:/opt/xos/xos_configuration/xos_cord_config:ro
-#        - .:/root/setup:ro
-#        - ./files/xos_vtn_config:/opt/xos/xos_configuration/xos_vtn_config:ro
-#        - ./images:/opt/xos/images:ro
-#    log_driver: "json-file"
-#    log_opt:
-#            max-size: "100k"
-#            max-file: "5"
-
 xos_bootstrap_ui:
     command: python /opt/xos/manage.py runserver 0.0.0.0:81 --insecure --makemigrations
     environment:
@@ -59,7 +44,8 @@
         - ./xos_cord_config:/opt/xos/xos_configuration/xos_cord_config:ro
         - ./files/xos_vtn_config:/opt/xos/xos_configuration/xos_vtn_config:ro
         - ../../xos_services:/opt/xos_services
+        - ./admin-openrc.sh:/root/setup/admin-openrc.sh
     log_driver: "json-file"
     log_opt:
-            max-size: "100k"
+            max-size: "1000k"
             max-file: "5"