Skip to content

Commit

Permalink
Remove Vagrant mentions. (apache#4779)
Browse files Browse the repository at this point in the history
  • Loading branch information
rabbah authored and dgrove-oss committed Jan 9, 2020
1 parent 1e7b6ec commit f418c25
Show file tree
Hide file tree
Showing 12 changed files with 5 additions and 627 deletions.
1 change: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ tools/cli/wsk text eol=lf
tools/cli/wskadmin text eol=lf

# bash files not having the .sh extension
tools/vagrant/simple/wsk text eol=lf
gradlew text eol=lf
core/javaAction/proxy/gradlew text eol=lf
sdk/docker/client/action text eol=lf
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ You do not have to include this information if this is a feature request.

## Environment details:

* local deployment, vagrant, native ubuntu, Mac OS, Bluemix, ...
* version of docker, vagrant, ubuntu, ...
* local deployment, native ubuntu, Mac OS, Bluemix, ...
* version of docker, ubuntu, ...

## Steps to reproduce the issue:

Expand Down
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ results
!/ansible/environments/docker-machine
!/ansible/environments/local
!/ansible/environments/mac
!/ansible/environments/vagrant

# Eclipse
bin/
Expand Down Expand Up @@ -47,9 +46,6 @@ build/
# NodeJS
node_modules

# Vagrant
.vagrant*

# IntelliJ
.idea
*.class
Expand Down
32 changes: 0 additions & 32 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ OpenWhisk is a cloud-first distributed event-based programming service. It provi
* [Quick Start](#quick-start) (Docker-Compose)
* [Native development](#native-development) (Mac and Ubuntu)
* [Kubernetes](#kubernetes-setup)
* [Vagrant](#vagrant-setup)
* [Learn concepts and commands](#learn-concepts-and-commands)
* [Issues](#issues)
* [Slack](#slack)
Expand All @@ -57,37 +56,6 @@ git clone https://github.com/apache/openwhisk-deploy-kube.git

Then follow the instructions in the [OpenWhisk on Kubernetes README.md](https://github.com/apache/openwhisk-deploy-kube/blob/master/README.md).

### Vagrant Setup
A [Vagrant](http://vagrantup.com) machine is also available to run OpenWhisk on Mac, Windows PC or GNU/Linux but isn't used by as much of the dev team so sometimes lags behind.
Download and install [VirtualBox](https://www.virtualbox.org/wiki/Downloads) and [Vagrant](https://www.vagrantup.com/downloads.html) for your operating system and architecture.

**Note:** For Windows, you may need to install an ssh client in order to use the command `vagrant ssh`. Cygwin works well for this, and Git Bash comes with an ssh client you can point to. If you run the command and no ssh is installed, Vagrant will give you some options to try.

Follow these step to run your first OpenWhisk Action:
```
# Clone openwhisk
git clone --depth=1 https://github.com/apache/openwhisk.git openwhisk
# Change directory to tools/vagrant
cd openwhisk/tools/vagrant
# Run script to create vm and run hello action
./hello.sh
```

Wait for hello action output:
```
wsk action invoke /whisk.system/utils/echo -p message hello --result
{
"message": "hello"
}
```

These steps were tested on Mac OS X El Capitan, Ubuntu 14.04.3 LTS and Windows using Vagrant.
For more information about using OpenWhisk on Vagrant see the [tools/vagrant/README.md](tools/vagrant/README.md)

During the Vagrant setup, the Oracle JDK 8 is used as the default Java environment. If you would like to use OpenJDK 8, please change the line "su vagrant -c 'source all.sh oracle'" into "su vagrant -c 'source all.sh'" in tools/vagrant/Vagrantfile.

### Native development

Docker must be natively installed in order to build and deploy OpenWhisk.
Expand Down
5 changes: 0 additions & 5 deletions ansible/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@ sudo pip install ansible==2.5.2
sudo pip install jinja2==2.9.6
```

#### Vagrant users
Nothing to be done, Ansible is already installed during vagrant provisioning.
You can skip setup and prereq steps as those have been done by vagrant for you.
You may jump directly to [Deploying Using CouchDB](#deploying-using-couchdb)

#### Docker for Mac users
```
sudo easy_install pip
Expand Down
6 changes: 2 additions & 4 deletions tools/db/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Before you can build and deploy OpenWhisk, you must configure a backing data sto

## Using CouchDB

If you are using your own installation of CouchDB, make a note of the host, port, username and password. Then provision a [custom Vagrant box](../vagrant/README.md) by following the instructions for a persistent CouchDB. In case you already have a Vagrant box, maybe using default settings you can simply adjust the existing db settings. Within your `openwhisk/ansible` directory, edit the file `db_local.ini` as appropriate. If you do not find `db_local.ini`, refer to [Setup](../../ansible/README.md#setup) to create it. Note that:
If you are using your own installation of CouchDB, make a note of the host, port, username and password, and adjust the properties in `openwhisk/ansible/db_local.ini` accordingly. If you do not find `db_local.ini`, refer to [Setup](../../ansible/README.md#setup) to create it. Note that:

* the username must have administrative rights
* the CouchDB instance must be accessible over `http` or `https` (the latter requires a valid certificate)
Expand Down Expand Up @@ -62,9 +62,7 @@ Make note of the Cloudant `username` and `password` from the last `cf` command s

### Setting the Cloudant credentials

Provision a [custom Vagrant box](../vagrant/README.md) by following the instructions for Cloudant.

If you already have an existing box, you can simply modify the settings in the VM. Within your `openwhisk/ansible` directory, edit the file `db_local.ini` as appropriate.
Edit the file `openwhisk/ansible/db_local.ini` to provide the required database properties.

Note that:

Expand Down
4 changes: 0 additions & 4 deletions tools/ubuntu-setup/docker-xenial.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,3 @@ sudo -E bash -c 'echo '\''DOCKER_OPTS="-H tcp://0.0.0.0:4243 -H unix:///var/run/
sudo gpasswd -a "$(whoami)" docker

sudo service docker restart

# do not run this command without a vagrant reload during provisioning
# it gives an error that docker is not up (which the reload fixes).
# sudo docker version
7 changes: 1 addition & 6 deletions tools/ubuntu-setup/docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ sudo add-apt-repository \
sudo apt-get -y update

# AUFS
# Use '-virtual' package to support docker tests of the script and still run under Vagrant
# Use '-virtual' package to support docker tests of the script
sudo apt-get --no-install-recommends -y install linux-image-extra-virtual

# DOCKER
Expand All @@ -42,9 +42,4 @@ sudo apt-mark hold docker-ce
sudo -E bash -c 'echo '\''DOCKER_OPTS="-H unix:///var/run/docker.sock --storage-driver=aufs"'\'' >> /etc/default/docker'
sudo gpasswd -a "$(whoami)" docker


sudo service docker restart

# do not run this command without a vagrant reload during provisioning
# it gives an error that docker is not up (which the reload fixes).
# sudo docker version
Loading

0 comments on commit f418c25

Please sign in to comment.