Răsfoiți Sursa

conform to new build format for vagrant (#153)

* conform to new build format for vagrant
Alan Lam 5 ani în urmă
părinte
comite
5c126cd42b

+ 1 - 16
examples/quickstart-vagrant/README.md

@@ -2,22 +2,7 @@
 
 
 This guide is intended to bring up a vagrant environment with 1 lighthouse and 2 generic hosts running nebula.
 This guide is intended to bring up a vagrant environment with 1 lighthouse and 2 generic hosts running nebula.
 
 
-## Pre-requisites
-
-There are two pre-requisites prior to bringing up the vagrant environment
-
-  - build the binaries locally for the vagrant deploy
-  - create a virtualenv for ansible
-
-### Building the binaries
-
-Build the `nebula` and `nebula-cert` binaries for vagrant by doing the following
-
-`make bin-vagrant` (under the src directory with Makefile)
-
-For convenience, ansible will run this for you in every deploy (see `ansible/playbook.yml`)
-
-### Creating the virtualenv
+## Creating the virtualenv for ansible
 
 
 Within the `quickstart/` directory, do the following
 Within the `quickstart/` directory, do the following
 
 

+ 4 - 1
examples/quickstart-vagrant/ansible/playbook.yml

@@ -8,7 +8,10 @@
   connection: local
   connection: local
   hosts: localhost
   hosts: localhost
   tasks:
   tasks:
-    - command: chdir=../../../ make bin-vagrant
+    - command: chdir=../../../ make build/linux-amd64/"{{ item }}"
+      with_items:
+        - nebula
+        - nebula-cert
   tags:
   tags:
     - build-nebula
     - build-nebula
    
    

+ 1 - 1
examples/quickstart-vagrant/ansible/roles/nebula/tasks/main.yml

@@ -8,7 +8,7 @@
     - nebula-conf
     - nebula-conf
   
   
 - name: install built nebula binary
 - name: install built nebula binary
-  copy: src=../../../../../{{ item }} dest=/usr/local/bin mode=0755
+  copy: src="../../../../../build/linux-amd64/{{ item }}" dest="/usr/local/bin" mode=0755
   with_items:
   with_items:
     - nebula
     - nebula
     - nebula-cert
     - nebula-cert