update readme based on comments. Add license

scripts/vagrant/zeppelin-dev/README.md

@@ -6,12 +6,15 @@ This script creates a virtual machine that launches a repeatable, known set of c
 
 This script requires three applications, [Ansible](http://docs.ansible.com/ansible/intro_installation.html#latest-releases-via-pip "Ansible"), [Vagrant](http://www.vagrantup.com/downloads "Vagrant") and [Virtual Box](https://www.virtualbox.org/ "Virtual Box").  All of these applications are freely available as Open Source projects and extremely easy to set up on most operating systems.
 
-### Create a Zeppelin Ready VM in 4 Steps
+### Create a Zeppelin Ready VM in 4 Steps (5 on Windows)
+
+*If you are running Windows and don't yet have python installed, install Python 2.7.x*  [Python Windows Installer](https://www.python.org/downloads/release/python-2710/)
 
 1. Download and Install Vagrant:  [Vagrant Downloads](http://www.vagrantup.com/downloads)
 2. Install Ansible:  [Ansible Python pip install](http://docs.ansible.com/ansible/intro_installation.html#latest-releases-via-pip)  
 `sudo easy_install pip` then   
-`sudo pip install ansible`
+`sudo pip install ansible`  
+`ansible --version` should now report version 1.9.2 or higher
 3. Install Virtual Box: [Virtual Box Downloads](https://www.virtualbox.org/ "Virtual Box")
 4. Type `vagrant up`  from within the `/scripts/vagrant/zeppelin-dev` directory
 
@@ -31,11 +34,11 @@ curl -fsSL https://raw.githubusercontent.com/NFLabs/z-manager/master/zeppelin-in
 
 You can now `git clone https://github.com/apache/incubator-zeppelin.git` into a directory on your host machine, or directly in your virtual machine.
 
-Cloning zeppelin into the `/scripts/vagrant/zeppelin-dev` directory from the host, will allow the directory to be shared between you host and the guest machine.
+Cloning zeppelin into the `/scripts/vagrant/zeppelin-dev` directory from the host, will allow the directory to be shared between your host and the guest machine.
 
 Cloning the project again may seem counter intuitive, since this script likley originated from the project repository.  Consider copying just the vagrant/zeppelin-dev script from the zeppelin project as a stand alone directory, then once again clone the specific branch you wish to build.
 
-Synced folders enable Vagrant to sync a folder on the host machine to the guest machine, allowing you to continue working on your project's files on your host machine, but use the resources in the guest machine to compile or run your project.[^1]
+Synced folders enable Vagrant to sync a folder on the host machine to the guest machine, allowing you to continue working on your project's files on your host machine, but use the resources in the guest machine to compile or run your project. _[(1) Synced Folder Description from Vagrant Up](https://docs.vagrantup.com/v2/synced-folders/index.html)_
 
 By default, Vagrant will share your project directory (the directory with the Vagrantfile) to `/vagrant`.  Which means you should be able to build within the guest machine after you   
 `cd /vagrant/incubator-zeppelin`
@@ -43,7 +46,7 @@ By default, Vagrant will share your project directory (the directory with the Va
 
 ### What's in this VM?
 
-Run the following commands, and should see the expected versions:
+Runing the following commands in the guest machine should display these expected versions:
 
 `node --version` should report *v0.12.7*  
 `mvn --version` should report *Apache Maven 3.3.3* and *Java version: 1.7.0_85*
@@ -82,15 +85,15 @@ If you [turned off port forwarding](#tweakvm) in the `Vagrantfile` browse to `ht
 
 If you plan to run this virtual machine along side other Vagrant images, you may wish to bind the virtual machine to a specific IP address, and not use port fowarding from your local host.
 
-Comment out the "forward_port" line, and uncomment the private_network line in Vagrantfile, such as:
+Comment out the `forward_port` line, and uncomment the `private_network` line in Vagrantfile.  The subnet that works best for your local network will vary so adjust `192.168.*.*` accordingly.
 
 ```
 #config.vm.network "forwarded_port", guest: 8080, host: 8080
 config.vm.network "private_network", ip: "192.168.51.52"
 ```
 
-`vagrant halt` followed by `vagrant up` will restart the guest machine bound to the IP address of 192.168.51.52.  
-This approach usually is typically required if running other virtual machines that discover each other directly by IP address, such as Spark Masters and Slaves as well as Cassandra Nodes, Elasticsearch Nodes, and other Spark data sources.  You may wish to launch nodes in virtual machines with IP Addresses such as: 192.168.51.53, 192.168.51.54, 192.168.51.53, etc..
+`vagrant halt` followed by `vagrant up` will restart the guest machine bound to the IP address of `192.168.51.52`.  
+This approach usually is typically required if running other virtual machines that discover each other directly by IP address, such as Spark Masters and Slaves as well as Cassandra Nodes, Elasticsearch Nodes, and other Spark data sources.  You may wish to launch nodes in virtual machines with IP Addresses in a subnet that works for your local network, such as: 192.168.51.53, 192.168.51.54, 192.168.51.53, etc..
 
 
 ### [Python Extras](id:pythonextras)
@@ -145,9 +148,6 @@ show(plt)
 ``` 
 
 
-[^1]:  Text referenced from the Vagrant instuctions: [https://docs.vagrantup.com/v2/synced-folders/index.html](https://docs.vagrantup.com/v2/synced-folders/index.html)
-
-
 
 
 

scripts/vagrant/zeppelin-dev/Vagrantfile

@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
@@ -15,7 +30,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # Disable automatic box update checking. If you disable this, then
   # boxes will only be checked for updates when the user runs
   # `vagrant box outdated`. This is not recommended.
-  config.vm.box_check_update = false
+  #config.vm.box_check_update = false
 
   # Create a forwarded port mapping which allows access to a specific port
   # within the machine from a port on the host machine.
@@ -25,7 +40,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.network "forwarded_port", guest: 8080, host: 8080
 
   # Uncomment to create a private network, which allows access to the machine
-  # using a specific IP.  Port forwarding not required in this case
+  # using a specific IP.  Port forwarding not required in this case.
+  # Select an address range based on a free block available
+  # in your network environment.  192.168.x.x is an example
   #config.vm.network "private_network", ip: "192.168.51.52"
 
 

scripts/vagrant/zeppelin-dev/ansible-roles.yml

@@ -1,3 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 ---
 - name: Run Ansible
   hosts: all

scripts/vagrant/zeppelin-dev/roles/common/tasks/main.yml

@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 - name: call apt-get update
   # this must be first so that apt-get installs to point to correct resources
   # Only run "update_cache=yes" if the last one is more than 3600 seconds (1 hour) ago

scripts/vagrant/zeppelin-dev/roles/java7jdk/tasks/main.yml

@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 - name: Install openjdk-7
   apt: pkg=openjdk-7-jdk state=present
   

scripts/vagrant/zeppelin-dev/roles/maven/tasks/main.yml

@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # setup maven
 # Assumes Ubuntu Server 14.04 LTS (HVM)
 # Assumes Java 7+ jdk installed

scripts/vagrant/zeppelin-dev/roles/nodejs/defaults/main.yml

@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 ---
 # Pin-Priority of NodeSource repository
 nodejs_nodesource_pin_priority: 500

scripts/vagrant/zeppelin-dev/roles/nodejs/handlers/main.yml

@@ -1,2 +0,0 @@
----
-# handlers file for nodejs

scripts/vagrant/zeppelin-dev/roles/nodejs/meta/main.yml

@@ -1,18 +0,0 @@
----
-galaxy_info:
-  author: Mark Wolfe
-  description: Installs the NodeSource Node.js binary packages
-  company: NodeSource
-  license: MIT
-  min_ansible_version: 1.2
-  platforms:
-   - name: Ubuntu
-     versions:
-       - precise
-       - trusty
-  categories:
-   - development
-   - networking
-   - packaging
-   - web
-dependencies: []

scripts/vagrant/zeppelin-dev/roles/nodejs/tasks/main.yml

@@ -1,4 +1,19 @@
-# Install Node.js using packages crafted by NodeSource
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Install Node.js via NodeSource
 ---
 - name: Ensure the system can use the HTTPS transport for APT
   stat:

scripts/vagrant/zeppelin-dev/roles/nodejs/templates/etc/apt/preferences.d/deb_nodesource_com_node.pref.2

@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # {{ ansible_managed }}
 
 Package: *

scripts/vagrant/zeppelin-dev/roles/nodejs/vars/main.yml

@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 ---
 # vars file for nodejs
 debian_repo_version: "{{ nodejs_version if '4' not in nodejs_version else '4.x' }}"

scripts/vagrant/zeppelin-dev/roles/python-addons/tasks/main.yml

@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # setup zeppelin python dependencies
 # Assumes Ubuntu Server 14.04 LTS (HVM) - ami-f64f77b3    64 bit
 # Assumes Java 7 installed as part of the top level playbook

scripts/vagrant/zeppelin-dev/show-instructions.sh

@@ -1,10 +1,29 @@
-echo 'From your host machine,' 
-echo 'git clone the incubator-zeppelin branch into this directory'
+#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+echo '# Post vagrant up instructions.'
+echo '# From your host machine,'
+echo '# git clone the incubator-zeppelin branch into this directory'
 echo
-echo 'Cloning the project again may seem counter intuitive, since this script'
-echo 'originated from the project repository.  Consider copying just the vagrant/zeppelin-dev'
-echo 'script from the zeppelin project as a stand alone directory, then once again clone'
-echo 'the specific branch you wish to build.'
+echo 'git clone https://github.com/apache/incubator-zeppelin.git'
+echo
+echo '# Cloning the project again may seem counter intuitive, since this script'
+echo '# originated from the project repository.  Consider copying just the vagrant/zeppelin-dev'
+echo '# script from the zeppelin project as a stand alone directory, then once again clone'
+echo '# the specific branch you wish to build.'
 echo
 echo 'vagrant ssh'
 echo