coffeeordeath/orchestration.vagrants
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.ahoskingit.com:9022/ahoskingit/orchestration.vagrants

Browse Source
This commit is contained in:
Alexander Hosking 2017-06-19 21:47:51 -04:00
commit e80698b810
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ahoskingit/config.yaml
View File

@ -1,14 +1,8 @@
--- ---
vagrants: vagrants:
"ubuntu/trusty64": "ubuntu/trusty64" "ubuntu/trusty64": "ubuntu/trusty64"
<<<<<<< HEAD
"ubuntu/xenial64": "ubuntu/xenial64" "ubuntu/xenial64": "ubuntu/xenial64"
"boxcutter/ubuntu1604": "boxcutter/ubuntu1604" "boxcutter/ubuntu1604": "boxcutter/ubuntu1604"
=======
"boxcutter/ubuntu1604": "boxcutter/ubuntu1604"
>>>>>>> dfcfe37cf523476c0bd27c2a0d6e75ab9189654d
hosts: hosts:
docker: 10.200.200.20 docker: 10.200.200.20
nextcloud: 10.200.200.2 nextcloud: 10.200.200.2