From 39405796901f7d09ec41f1d5a2377ee10658f1f9 Mon Sep 17 00:00:00 2001
From: Mark Korondi <korondi.mark@gmail.com>
Date: Thu, 4 May 2017 12:38:49 +0200
Subject: [PATCH] VMware player supported. USE_SCREEN=True

---
 README.md                                    | 26 ++++++++++++++------
 files/etc/network/interfaces.d/50-vmware.cfg |  2 ++
 files/opt/devstack/local.conf                |  3 +++
 install-base.sh                              |  4 +++
 install-gui.sh                               |  3 +++
 5 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100644 files/etc/network/interfaces.d/50-vmware.cfg

diff --git a/README.md b/README.md
index 94ddee1..400abec 100644
--- a/README.md
+++ b/README.md
@@ -6,22 +6,34 @@ OpenStack Upstream Institute Virtual Environment
 Instructions
 ------------
 
+### Using VirtualBox
+
 1. Set up [VirtualBox]
 2. Go to the [releases] page and download the [latest VM image][image].
 3. Import  the `ova` file  (`File` ->  `Import appliance...`)
     > on  Windows? look [here][ova-import-help].)
 4. Start up the VM
 
-**Minimum requirements:**
+### Using VMware player
+
+1. Set up [VMware player]
+2. Go to the [releases] page and download the [latest VM image][image].
+3. Open the `ova` file (`File` -> `Open a Virtual Machine`)
+    > A warning dialog might appear. Click on `Retry`
+4. Start up the VM
+
+[VirtualBox]: https://www.virtualbox.org/wiki/Downloads
+[VMware player]: http://www.vmware.com/products/player/playerpro-evaluation.html
+[image]: https://github.com/kmARC/openstack-training-virtual-environment/releases/download/v2017.01/upstream-training-v2017.01.ova
+[releases]: https://github.com/kmARC/openstack-training-virtual-environment/releases
+[ova-import-help]: README-virtualbox-import.md
+
+### Minimum requirements
 
 * 5GB of **free** RAM (so at least 8GB in your laptop)
 * Recent CPU with at least 4 cores
 * 15GB disk space
 
-[VirtualBox]: https://www.virtualbox.org/wiki/Downloads
-[image]: https://github.com/kmARC/openstack-training-virtual-environment/releases/download/v2017.01/upstream-training-v2017.01.ova
-[releases]: https://github.com/kmARC/openstack-training-virtual-environment/releases
-[ova-import-help]: README-virtualbox-import.md
 
 Getting around in the VM
 ------------------------
@@ -42,7 +54,7 @@ Getting around in the VM
         > start before logging in to Freenode channels.
 
 3. When `stack.sh` finished running, you can open your [Horizon Dashboard]
-    using the **DevStack** bookmark.
+    (http://localhost/) or on VirtualBox using the **DevStack** bookmark
 
     * **Login**: `demo`
     * **Password**: `openstack`
@@ -55,7 +67,7 @@ Getting around in the VM
 
 7. Enable SSH and ICMP ports on the security groups
 
-[Horizon Dashboard]: http://192.168.10.15/dashboard/
+[Horizon Dashboard]: http://localhost/
 
 Learn how to set up devstack
 ----------------------------
diff --git a/files/etc/network/interfaces.d/50-vmware.cfg b/files/etc/network/interfaces.d/50-vmware.cfg
new file mode 100644
index 0000000..3a4a7d2
--- /dev/null
+++ b/files/etc/network/interfaces.d/50-vmware.cfg
@@ -0,0 +1,2 @@
+auto ens32
+iface ens32 inet dhcp
diff --git a/files/opt/devstack/local.conf b/files/opt/devstack/local.conf
index 516acb7..854f7bc 100644
--- a/files/opt/devstack/local.conf
+++ b/files/opt/devstack/local.conf
@@ -9,6 +9,9 @@ DATABASE_PASSWORD=$ADMIN_PASSWORD
 RABBIT_PASSWORD=$ADMIN_PASSWORD
 SERVICE_PASSWORD=$ADMIN_PASSWORD
 
+# Use old-school screen instead of systemd
+USE_SCREEN=True
+
 # Git fine tuning. HTTPS is usually enabled on firewalls.
 # Depth should be only one for upstream training purposes
 GIT_DEPTH=1
diff --git a/install-base.sh b/install-base.sh
index 43122f1..ef52b75 100755
--- a/install-base.sh
+++ b/install-base.sh
@@ -27,3 +27,7 @@ sudo apt install -y htop mc tmux
 # Set password
 echo "$USER:openstack" | sudo chpasswd
 
+# Disable Console serial port redirection
+sudo sed -i "s/console=ttyS0//g" /etc/default/grub
+sudo sed -i "s/console=ttyS0//g" /etc/default/grub.d/*
+sudo update-grub
diff --git a/install-gui.sh b/install-gui.sh
index 4d56e04..69e4d67 100755
--- a/install-gui.sh
+++ b/install-gui.sh
@@ -14,4 +14,7 @@ sudo apt install -y firefox xfce4-terminal xfce4-whiskermenu-plugin \
                     vim-gtk geany hexchat
 # Configure virtualbox GUI
 sudo apt install -y virtualbox-guest-dkms virtualbox-guest-x11
+# Configure vmware GUI
+sudo apt install -y open-vm-tools-desktop open-vm-tools-dkms \
+                    xserver-xorg-input-vmmouse xserver-xorg-video-vmware