Merge branch 'dev'

* dev:
  v0.3.3

Conflicts:
	README.md

Author: rimusz

README.md

@@ -0,0 +1,69 @@
+CoreOS-Vagrant Cluster GUI for OS X
+============================
+
+CoreOS-Vagrant Cluster GUI for Mac OS X is a Mac Status bar App which works like a wrapper around the [coreos-vagrant](https://github.com/coreos/coreos-vagrant) command line tool and bootstraps CoreOS cluster with one control (etcd) and two worker machines. Flannel network is set too.
+
+Supports etcd2 in all CoreOS release channels.
+
+####Note: OS X El Capitan:
+
+* If you do a fresh install OS X El Capitan support will be enabled
+
+* Otherwise run: `ln -s /opt/vagrant/bin/vagrant /usr/local/bin/vagrant >/dev/null 2>&1`
+
+
+ 
+[CoreOS](https://coreos.com) is a Linux distribution made specifically to run [Docker](https://www.docker.io/) containers.
+[CoreOS-Vagrant](https://github.com/coreos/coreos-vagrant) is made to run on VirtualBox and VMWare VMs.
+
+![CoreOS-Vagrant-Cluster-GUI](coreos-vagrant-cluster-gui.png "CoreOS-Vagrant-Cluster-GUI")
+
+Download
+--------
+Head over to the [Releases Page](https://github.com/rimusz/coreos-osx-gui-cluster/releases) to grab the latest release.
+
+
+How to install
+----------
+
+Required software
+* [VirtualBox](https://www.virtualbox.org/wiki/Downloads), [Vagrant](http://www.vagrantup.com/downloads.html) and [iTerm 2](http://www.iterm2.com/#/section/downloads)
+
+* Download `CoreOS Cluster GUI latest.zip` from the [Releases Page](https://github.com/rimusz/coreos-osx-gui-cluster/releases) and unzip it.
+* Start the `CoreOS Cluster GUI` and from menu `Setup` choose `Initial setup of CoreOS-Vagrant Cluster` 
+* The install will do the following:
+````
+1) All dependent files/folders will be put under 'coreos-osx-cluster' folder in the user's 
+ home folder e.g '/Users/someuser/coreos-osx-cluster'
+2) Will clone latest coreos-vagrant from git
+3) user-data file will have fleet, etcd and 'reboot off' set
+4) control (etcd) machine will be set with IP `172.17.9.101` and two cluster nodes with IPs: `172.17.9.102 and 172.17.9.103`
+5) Will download and install fleetctl and etcdctl clients to ~/coreos-osx-cluster/bin/
+6) Will download latest vagrant VBox and run vagrant up to initialise VM
+````
+
+How it works
+------------
+
+Just start `CoreOS Cluster GUI` application and you will find a small icon with the CoreOS logo with the (C) which means for cluster in the Status Bar.
+
+* There you can `Up`, `Suspend`, `Halt`, `Reload` CoreOS vagrant VMs
+* Under `Up' and 'OS shell` OS Shell will have such environment set:
+````
+1) Path to ~/coreos-osx-cluster/bin where etcdclt and fleetctl binaries are stored
+2) etcd endpoint - export ETCDCTL_PEERS=http://172.17.9.101:4001
+3) fleetctl endpoint - export FLEETCTL_ENDPOINT=http://172.17.9.101:4001
+````
+
+* `SSH to control-01 and node-01/02` menu options will open VM shells.
+* Updates/Update OS X fleetctl and etcdclt will update fleetctl, etcdclt clients to the same versions as CoreOS VMs run.
+* Updates/Force CoreOS update will be run sudo update_engine_client -update on each CoreOS VM.
+* Updates/Check updates for CoreOS vbox will update CoreOS VM vagrant box.
+* [Fleet-UI](http://fleetui.com) dashboard will show running fleet units and etc
+
+
+Other links
+-----------
+* A standalone CoreOS VM version of OS X App can be found here [CoreOS-Vagrant GUI](https://github.com/rimusz/coreos-osx-gui).
+
+* Kubernetes Cluster one CoreOS VM of OS X App can be found here [CoreOS-Vagrant Kubernetes Cluster GUI ](https://github.com/rimusz/coreos-osx-gui-kubernetes-cluster).

src/CoreOS Cluster GUI.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 47;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -239,7 +239,7 @@
 				};
 			};
 			buildConfigurationList = 01E2853518A6C4E300BC630D /* Build configuration list for PBXProject "CoreOS Cluster GUI" */;
-			compatibilityVersion = "Xcode 3.2";
+			compatibilityVersion = "Xcode 6.3";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
@@ -410,7 +410,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "CoreOS Cluster GUI/CoreOS Cluster GUI-Prefix.pch";
 				INFOPLIST_FILE = "CoreOS Cluster GUI/CoreOS Cluster GUI-Info.plist";
-				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				PRODUCT_NAME = "CoreOS Cluster GUI";
 				PROVISIONING_PROFILE = "";
 				WRAPPER_EXTENSION = app;
@@ -427,7 +427,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "CoreOS Cluster GUI/CoreOS Cluster GUI-Prefix.pch";
 				INFOPLIST_FILE = "CoreOS Cluster GUI/CoreOS Cluster GUI-Info.plist";
-				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				PRODUCT_NAME = "CoreOS Cluster GUI";
 				PROVISIONING_PROFILE = "";
 				WRAPPER_EXTENSION = app;

src/CoreOS Cluster GUI/CoreOS Cluster GUI-Info.plist

@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.3.2</string>
+	<string>0.3.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>111</string>
+	<string>115</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

src/coreos-vagrant-install.command

@@ -6,6 +6,9 @@
 #  Created by Rimantas on 01/04/2014.
 #  Copyright (c) 2014 Rimantas Mocevicius. All rights reserved.
 
+# create symbolic link for vagrant to work on OS X 10.11
+ln -s /opt/vagrant/bin/vagrant /usr/local/bin/vagrant >/dev/null 2>&1
+
     # create "coreos-osx-cluster" and other required folders and files at user's home folder where all the data will be stored
     mkdir ~/coreos-osx-cluster
     mkdir ~/coreos-osx-cluster/tmp

src/coreos-vagrant.command

@@ -6,10 +6,12 @@
 #  Created by Rimantas on 01/04/2014.
 #  Copyright (c) 2014 Rimantas Mocevicius. All rights reserved.
 
+# overwrite for OS X 10.11
+vagrant=/usr/local/bin/vagrant
 
 # pass first argument - up, halt ...
 cd ~/coreos-osx-cluster/control
-vagrant $1
+$vagrant $1
 
 cd ~/coreos-osx-cluster/workers
-vagrant $1
+$vagrant $1