diff --git a/README.md b/README.md index 273671a..56c180b 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,6 @@ Deploying dcos-vagrant involves creating a local cluster of VirtualBox VMs using - [Deploy](#deploy) - [Configure](#configure) - [Example Clusters](#example-clusters) -- [Install DC/OS Services](#install-dcos-services) - [Environment Options](#environment-options) - [License and Author](#license-and-author) @@ -210,7 +209,7 @@ Most services *can* be installed on the Medium cluster, but not all at the same Once the the machines are created and provisioned, DC/OS will be installed. Once complete, the Web Interface will be available at . - See [Install DC/OS Services](#install-dcos-services) for more information on how to use you new DC/OS cluster. + See the [DC/OS Usage docs](https://dcos.io/docs/latest/usage/service-install/) for more information on how to use you new DC/OS cluster. 1. (Optional) Authentication @@ -310,29 +309,6 @@ vagrant up m1 m2 m3 a1 a2 a3 a4 a5 a6 p1 p2 p3 boot ``` -# Install DC/OS Services - -Once DC/OS is installed, services can be installed using the DC/OS CLI as a package manager. In order to install the DC/OS CLI itself, follow the instructions in the popup when first visiting the DC/OS dashboard (http://m1.dcos/). For more information, see the [DC/OS CLI Docs](https://dcos.io/docs/latest/usage/cli/). - -For example, the following installs cassandra (which requires at least 3 private agent nodes): - -```bash -dcos package install cassandra -``` - -## Marathon Apps - -Marathon apps can be installed by using the [dcos cli marathon plugin](https://dcos.io/docs/latest/usage/cli/command-reference/#dcos-marathon). - -For example, see [Oinker on Marathon](./examples/oinker/) or the [Java-Spring Example App](./examples/java-spring/). - -## Kubernetes Apps - -Kubernetes apps can be installed by using the [dcos cli kubectl plugin](https://github.com/mesosphere/dcos-kubectl). - -For example, see the [Oinker on Kubernetes Example](./examples/kube-oinker/). - - # Environment Options There are several configurable options when deploying a cluster and installing DC/OS on it. Most of them are configurable via environment variables: @@ -354,15 +330,6 @@ There are several configurable options when deploying a cluster and installing D Additional advanced configuration may be possible by modifying the Vagrantfile directly, but is not encouraged because the internal APIs may change at any time. -## Install - -```bash -vagrant plugin install vagrant-vbguest -``` - -This allows the pre-built vagrant box image to work on multiple (past and future) versions of VirtualBox. - - # License and Author Copyright 2016 Mesosphere, Inc. diff --git a/docs/virtualbox-guest-additions.md b/docs/virtualbox-guest-additions.md index 71adcf5..f291e46 100644 --- a/docs/virtualbox-guest-additions.md +++ b/docs/virtualbox-guest-additions.md @@ -2,4 +2,12 @@ Ideally, the vagrant box image used by dcos-vagrant includes VirtualBox Guest Additions compatible with the latest versions of VirtualBox. It should "just work". -However, if they are out of date or incompatible with your installed version of VirtualBox you may want to install the [VBGuest Vagrant Plugin](https://github.com/dotless-de/vagrant-vbguest) to automatically install VirtualBox Guest Additions appropriate to your local VirtualBox version on each new VM after it is created. \ No newline at end of file +However, if they are out of date or incompatible with your installed version of VirtualBox you may want to install the [VBGuest Vagrant Plugin](https://github.com/dotless-de/vagrant-vbguest) to automatically install VirtualBox Guest Additions appropriate to your local VirtualBox version on each new VM after it is created. + +## Install + +```bash +vagrant plugin install vagrant-vbguest +``` + +This allows the pre-built vagrant box image to work on multiple (past and future) versions of VirtualBox. diff --git a/examples/kube-oinker/README.md b/examples/kube-oinker/README.md deleted file mode 100644 index 5ba48b2..0000000 --- a/examples/kube-oinker/README.md +++ /dev/null @@ -1,113 +0,0 @@ -# Oinker on Kubernetes on DC/OS - -This example runs [Oinker-Go](https://github.com/mesosphere/oinker-go) on [Kubernete-Mesos](https://github.com/mesosphere/kubernetes-mesos) on [DC/OS Vagrant](https://github.com/dcos/dcos-vagrant) with [Cassandra-Mesos](https://github.com/mesosphere/cassandra-mesos). - - -## Install DC/OS - -1. Follow the [dcos-vagrant setup](https://github.com/dcos/dcos-vagrant#setup) steps to configure your installation. -1. Use vagrant to deploy a cluster with 4 agent nodes (requires 10GB free memory): - - ``` - vagrant up m1 a1 a2 a3 a4 boot - ``` -1. Wait for DC/OS to come up. Check the dashboard: . -1. Install the [DC/OS CLI](https://dcos.io/docs/latest/usage/cli/) by following the instructions on the DC/OS Dashboard - - -## Install Cassandra - -1. Configure Cassandra with lower memory usage than default: - - ``` - cat >/tmp/cassandra.json <. - -## Add Multiverse Package Repository - -Kubernetes and etcd are in the Multiverse repo. So the Multiverse must be added to the DC/OS CLI config. - -See the [DC/OS CLI docs](../../docs/dcos-cli.md#multiverse) on how to add the multiverse repo. - -## Install etcd - -1. Configure etcd with lower memory usage than default: - - ``` - cat >/tmp/etcd.json <. - - -## Install Kubernetes - -1. Configure Kubernetes with lower memory usage than default: - - ``` - cat >/tmp/kubernetes.json <. - - -## Install Oinker - -1. Create the Oinker replication controller and service: - - ``` - dcos kubectl create -f oinker.yaml - ``` -1. Wait for Kubernetes to deploy 3 pod instances. - - ``` - dcos kubectl get pod -l=app=oinker - ``` -1. Find the oinker endpoint: - - ``` - dcos kubectl get endpoints -l=app=oinker - ``` - -## TODO - -1. Multiple oinker instances with a load balancer in front (e.g. [service-loadbalancer](https://github.com/kubernetes/contrib/tree/master/service-loadbalancer)) - requires more/larger nodes diff --git a/examples/kube-oinker/oinker.yaml b/examples/kube-oinker/oinker.yaml deleted file mode 100644 index 1b029fb..0000000 --- a/examples/kube-oinker/oinker.yaml +++ /dev/null @@ -1,63 +0,0 @@ -kind: List -metadata: {} -apiVersion: v1 -items: -- apiVersion: v1 - kind: ReplicationController - metadata: - name: oinker-go - labels: - app: oinker - spec: - replicas: 1 - selector: - app: oinker - template: - metadata: - labels: - app: oinker - spec: - containers: - - name: server - image: mesosphere/oinker-go:latest - imagePullPolicy: Always - command: - - "oinker" - - "--cassandra-addr=cassandra-dcos-node.cassandra.dcos.mesos" - - "--cassandra-repl=3" - readinessProbe: - httpGet: - path: /ready - port: http - initialDelaySeconds: 15 - timeoutSeconds: 1 - livenessProbe: - tcpSocket: - port: http - initialDelaySeconds: 15 - timeoutSeconds: 1 - ports: - - name: http - containerPort: 8080 - hostPort: 8888 - resources: - limits: - cpu: 0.1 - memory: 32Mi - env: - - name: OINKER_INSTANCE_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name -- apiVersion: v1 - kind: Service - metadata: - name: oinker - labels: - app: oinker - spec: - selector: - app: oinker - ports: - - port: 80 - targetPort: http