From c430cf433e3b35be101b2d6e279e14656ef49f12 Mon Sep 17 00:00:00 2001
From: Kevin Carter <kevin@cloudnull.com>
Date: Sat, 19 Jan 2019 21:24:28 -0600
Subject: [PATCH] Update readme and make commands

The readme was updated for correctness.

The make command when building skydive was changed from "install"
to "static" this was done to assist folks building skydive which
"should" allow it to be redistributable.

Change-Id: I01f8f677f1ccf54d8dd29ac8a2eb60c0206319a0
Signed-off-by: Kevin Carter <kevin@cloudnull.com>
---
 skydive/README.md                            | 21 +++++++++++---------
 skydive/roles/make_skydive/defaults/main.yml |  8 ++++++++
 skydive/roles/make_skydive/tasks/main.yml    |  6 +++---
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/skydive/README.md b/skydive/README.md
index 646b1925..1cdf3907 100644
--- a/skydive/README.md
+++ b/skydive/README.md
@@ -172,17 +172,20 @@ This config will provide access to the web UI for both **skydive** and
 
 ##### OpenStack Integration
 
-Skydive can be configured to work with OpenStack. For this to work a
-`clouds.yaml` must be present on one of the nodes used within the deployment;
-the path is typically to the clouds config is typically
-`$HOME/.config/openstack/clouds.yaml`. The playbooks will use the
-`clouds.yaml` file to read nessisary credentials used to create a new users
-and roles to be used with `skydive` and to enable neutron probes within the
-`skydive` agent.
+Skydive can be configured to work with OpenStack. For this to be enabled, a
+`clouds.yaml` file must be present on one of the nodes used within the
+deployment.
+
+> The default check path for the `clouds.yaml` file is:
+  `$HOME/.config/openstack/clouds.yaml`
+
+The playbooks will use the `clouds.yaml` file to read nessisary credentials
+used to create a new user and role, which will provide the skydive-agents
+access to neutron.
 
 When OpenStack integration is enabled, all authentication will be done through
-keystone. User access to the skydive UI will be restricted to only users that
-have the skydive role assigned to them.
+keystone. User access to the skydive UI will be restricted to only users with
+the `skydive` role assigned to them.
 
 All available options for the OpenStack integration can be found in the
 `defaults/main.yml` file.
diff --git a/skydive/roles/make_skydive/defaults/main.yml b/skydive/roles/make_skydive/defaults/main.yml
index 1a4446d8..bc31e86f 100644
--- a/skydive/roles/make_skydive/defaults/main.yml
+++ b/skydive/roles/make_skydive/defaults/main.yml
@@ -13,17 +13,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Build properties
 skydive_build_version: HEAD
 
+skydive_build_git_repo: https://github.com/skydive-project/skydive.git
+
 skydive_build_path: "/opt/skydive-build/{{ skydive_build_version }}"
 
 skydive_build_go_path: "{{ skydive_build_path }}/go"
 
 skydive_build_project_path: "{{ skydive_build_go_path }}/src"
 
+# Skydive has a number of build flags, most of which are undocumented. That said,
+# Please review the documentation for more on build properties:
+# http://skydive.network/documentation/build
 skydive_build_use_flags: >-
   WITH_EBPF=true
   WITH_NEUTRON=true
   WITH_LXD=true
   WITH_PROF=true
   WITH_CDD=true
+  WITH_LIBVIRT=true
+  WITH_SCALE=true
diff --git a/skydive/roles/make_skydive/tasks/main.yml b/skydive/roles/make_skydive/tasks/main.yml
index 717167d5..a689cff6 100644
--- a/skydive/roles/make_skydive/tasks/main.yml
+++ b/skydive/roles/make_skydive/tasks/main.yml
@@ -45,7 +45,7 @@
 - name: Get the skydive archive
   git:
     dest: "{{ skydive_build_project_path }}/github.com/skydive-project/skydive"
-    repo: https://github.com/skydive-project/skydive.git
+    repo: "{{ skydive_build_git_repo }}"
     force: yes
     track_submodules: yes
     clone: yes
@@ -53,12 +53,12 @@
     recursive: yes
     version: "{{ skydive_build_version }}"
 
-- name: Make install skydive
+- name: Make static skydive
   shell: |
     source /etc/default/go
     export PATH="{{ skydive_build_go_path }}/bin:${PATH}"
     export GOPATH="{{ skydive_build_go_path }}"
-    make install {{ skydive_build_use_flags }}
+    make static {{ skydive_build_use_flags }}
   args:
     chdir: "{{ skydive_build_project_path }}/github.com/skydive-project/skydive"
     executable: "/bin/bash"