From 4ec42ceff3cb8515a4e9c23312c1ca70a25124fb Mon Sep 17 00:00:00 2001 From: Mark Korondi Date: Tue, 31 Oct 2017 14:07:15 +0100 Subject: [PATCH] Fixes for Sydney. Removed re-stacking instructions. Gitreview set up. Change-Id: Idb90f9a7cf79a0cd16622a00b3c02279b4638801 --- .gitreview | 5 +++++ README.md | 20 ++++++------------ cleanup.sh | 9 -------- create-training-box.sh | 2 ++ .../places.sqlite | Bin 1146880 -> 1212416 bytes .../{yncyd31n.default => profile}/prefs.js | 2 +- .../xulstore.json | 0 .../home/ubuntu/.mozilla/firefox/profiles.ini | 2 +- install-base.sh | 7 +++--- install-devstack.sh | 2 +- 10 files changed, 21 insertions(+), 28 deletions(-) create mode 100644 .gitreview rename files/home/ubuntu/.mozilla/firefox/{yncyd31n.default => profile}/places.sqlite (92%) rename files/home/ubuntu/.mozilla/firefox/{yncyd31n.default => profile}/prefs.js (98%) rename files/home/ubuntu/.mozilla/firefox/{yncyd31n.default => profile}/xulstore.json (100%) diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..85bf659 --- /dev/null +++ b/.gitreview @@ -0,0 +1,5 @@ +[gerrit] +host=review.openstack.org +port=29418 +project=openstack/upstream-institute-virtual-environment.git + diff --git a/README.md b/README.md index c9f9646..76a3933 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ OpenStack Upstream Institute Virtual Environment ================================================ -

bit.ly/training-vm

+

bit.ly/upstream-institute-vm

Instructions ------------ @@ -38,13 +38,7 @@ Instructions Getting around in the VM ------------------------ -1. Open a terminal and start devstack - ``` bash - /opt/devstack/stack.sh && optimize-memory - ``` - This step takes about 10 minutes. - -2. Explore the environment. The four main software you will be using from the +1. Explore the environment. The four main software you will be using from the desktop during the training are: * **Firefox** web browser * **Xfce4-terminal** terminal emulator @@ -53,19 +47,19 @@ Getting around in the VM > please make sure that you replace the default user `ubuntu` upon first > start before logging in to Freenode channels. -3. When `stack.sh` finished running, you can open your [Horizon Dashboard] +2. When `stack.sh` has finished running, you can open your [Horizon Dashboard] (http://localhost/) or on VirtualBox using the **DevStack** bookmark * **Login**: `demo` * **Password**: `openstack` -4. Select the `demo` project +3. Select the `demo` project -5. Start a VM. Use a tiny flavor. A CirrOS image is already set up by devstack +4. Start a VM. Use a tiny flavor. A CirrOS image is already set up by devstack -6. Assign a floating IP +5. Assign a floating IP -7. Enable SSH and ICMP ports on the security groups +6. Enable SSH and ICMP ports on the security groups [Horizon Dashboard]: http://localhost/ diff --git a/cleanup.sh b/cleanup.sh index 27437ae..70a0cbc 100755 --- a/cleanup.sh +++ b/cleanup.sh @@ -26,15 +26,6 @@ sudo apt autoremove --purge -y humanity-icon-theme snapd lxc.* lxd.* # Empty packages cache sudo apt clean sudo apt autoclean -sudo rm -rf /var/lib/apt/lists/* - -# Remove mysql databases (will be recreated by stack.sh -for db in cinder glance keystone neutron nova nova_api nova_cell0; do - echo "drop database $db;" | mysql -uroot -popenstack -done - -# Remove log files -sudo rm -rf /var/log/* # Zero out unused space dd if=/dev/zero of=~/ZERO bs=1M status=progress diff --git a/create-training-box.sh b/create-training-box.sh index f0dcb26..a7e4c25 100755 --- a/create-training-box.sh +++ b/create-training-box.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -e + VDISKMANAGER_DOWNLOAD='https://kb.vmware.com/selfservice/viewAttachment.do?attachID=1023856-vdiskmanager-linux.7.0.1.zip&documentID=1023856' vagrant up diff --git a/files/home/ubuntu/.mozilla/firefox/yncyd31n.default/places.sqlite b/files/home/ubuntu/.mozilla/firefox/profile/places.sqlite similarity index 92% rename from files/home/ubuntu/.mozilla/firefox/yncyd31n.default/places.sqlite rename to files/home/ubuntu/.mozilla/firefox/profile/places.sqlite index a1a3f9a5356d262ddad73a3740426bc54fe40301..d648ce992f9ee937d7542325e501d309a23e8e8a 100644 GIT binary patch delta 4640 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 B_@w{< diff --git a/files/home/ubuntu/.mozilla/firefox/yncyd31n.default/prefs.js b/files/home/ubuntu/.mozilla/firefox/profile/prefs.js similarity index 98% rename from files/home/ubuntu/.mozilla/firefox/yncyd31n.default/prefs.js rename to files/home/ubuntu/.mozilla/firefox/profile/prefs.js index 96630fa..e071782 100644 --- a/files/home/ubuntu/.mozilla/firefox/yncyd31n.default/prefs.js +++ b/files/home/ubuntu/.mozilla/firefox/profile/prefs.js @@ -39,7 +39,7 @@ user_pref("browser.search.region", "CH"); user_pref("browser.sessionstore.upgradeBackup.latestBuildID", "20160919213721"); user_pref("browser.slowStartup.averageTime", 2435); user_pref("browser.slowStartup.samples", 2); -user_pref("browser.startup.homepage", "https://github.com/kmARC/openstack-training-virtual-environment/blob/master/README.md#getting-around-in-the-vm"); +user_pref("browser.startup.homepage", "http://bit.ly/upstream-institute-vm"); user_pref("browser.startup.homepage_override.buildID", "20160919213721"); user_pref("browser.startup.homepage_override.mstone", "49.0"); user_pref("browser.tabs.remote.autostart.2", true); diff --git a/files/home/ubuntu/.mozilla/firefox/yncyd31n.default/xulstore.json b/files/home/ubuntu/.mozilla/firefox/profile/xulstore.json similarity index 100% rename from files/home/ubuntu/.mozilla/firefox/yncyd31n.default/xulstore.json rename to files/home/ubuntu/.mozilla/firefox/profile/xulstore.json diff --git a/files/home/ubuntu/.mozilla/firefox/profiles.ini b/files/home/ubuntu/.mozilla/firefox/profiles.ini index a5ef88a..eb2a147 100644 --- a/files/home/ubuntu/.mozilla/firefox/profiles.ini +++ b/files/home/ubuntu/.mozilla/firefox/profiles.ini @@ -4,6 +4,6 @@ StartWithLastProfile=1 [Profile0] Name=default IsRelative=1 -Path=yncyd31n.default +Path=profile Default=1 diff --git a/install-base.sh b/install-base.sh index ef52b75..cbca242 100755 --- a/install-base.sh +++ b/install-base.sh @@ -7,13 +7,14 @@ export DEBIAN_FRONTEND=noninteractive REPO=$(dirname "$(readlink -f "$0")")/ # Copy configs -sudo cp -ar "$REPO/files/etc" / -sudo cp -ar "$REPO/files/home" / +sudo cp -r "$REPO/files/etc" / +sudo cp -r "$REPO/files/home" / sudo chown -R "$USER:$GROUP" /home/ # Copy scripts -sudo cp -ar "$REPO/files/usr" / +sudo cp -r "$REPO/files/usr" / +# Update and upgrade sudo sed -i "s@http://archive.ubuntu.com@$APT_MIRROR@g" /etc/apt/sources.list sudo apt update sudo apt dist-upgrade -y diff --git a/install-devstack.sh b/install-devstack.sh index acd34a5..cc1b056 100755 --- a/install-devstack.sh +++ b/install-devstack.sh @@ -8,7 +8,7 @@ sudo chown -R "$USER:$GROUP" /opt/devstack git clone --depth=1 https://git.openstack.org/openstack-dev/devstack \ /opt/devstack -cp -ar "$REPO/files/opt" / +cp -r "$REPO/files/opt" / /opt/devstack/stack.sh