Skip to content

Commit 1357bec

Browse files
committed
updated readme; few more random fixes for initial release
1 parent 8bf0e90 commit 1357bec

3 files changed

Lines changed: 33 additions & 16 deletions

File tree

README.md

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,27 @@
11
# upvm
22
Leverage virt-builder & virt-install to spin up new VMs with ease
33

4-
### Upcoming release
5-
6-
Date of [first release](https://github.com/ryran/upvm/milestones/0.10.0%20albino%20salamander%20%28first%20release%29) (including rpm for RHEL7/Fedora): Monday February 1st
7-
84
### Requirements
95

106
You need:
117

12-
- libvirt, libguestfs-tools (`virt-builder`), virt-install
8+
- libvirtd & libvirt-client (`virsh`)
9+
- libguestfs-tools (`virt-builder`)
10+
- virt-install
1311

14-
These two are not required, but are highly recommended:
12+
These two are not required, but are highly recommended for bash-tab-completion & config-file support:
1513

16-
1. `pip install argcomplete; activate-global-python-argcomplete`
17-
1. `pip install configargparse`
14+
- `pip install argcomplete; activate-global-python-argcomplete`
15+
- `pip install configargparse`
16+
17+
### Install
18+
19+
You can clone the git repo and execute `upvm.py` from it. For rpm installation in RHEL 7.2+ and Fedora 22+:
1820

21+
1. `dnf install http://people.redhat.com/rsawhill/rpms/latest-rsawaroha-release.rpm`
22+
1. `dnf install upvm`
23+
1. `/usr/share/upvm/initial-setup`
24+
1. `upvm -h`
1925

2026
### Help page
2127

@@ -219,6 +225,6 @@ ABOUT CONFIG FILES:
219225
override config file values which override defaults.
220226
221227
VERSION:
222-
upvm v0.10.0~rc last mod 2016/01/30
228+
upvm v0.10.0 last mod 2016/02/02
223229
See <http://github.com/ryran/upvm> to report bugs or RFEs
224230
```

initial-setup

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@ if getenforce | egrep -sq '^(Permissive|Enforcing)$' && ! command -v semanage >/
1616
exit 1
1717
fi
1818

19-
prg=upvm
20-
cacheDir="/var/cache/$prg"
21-
imageDir="/var/lib/$prg"
22-
domain=example.com
23-
2419
if getent group libvirt >/dev/null; then
2520
libvirtGID=$(getent group libvirt | cut -d: -f3)
2621
else
@@ -42,6 +37,22 @@ else
4237
exit 1
4338
fi
4439

40+
if ! systemctl is-active libvirtd.service &>/dev/null; then
41+
echo -e "\nStarting libvirtd.service ...\n"
42+
systemctl start libvirtd.service
43+
fi
44+
45+
if ! virt-host-validate; then
46+
echo -e "\nvirt-host-validate command failed"
47+
echo "You probably need to enable hardware virtualization in BIOS/UEFI"
48+
exit 1
49+
fi
50+
51+
prg=upvm
52+
cacheDir="/var/cache/$prg"
53+
imageDir="/var/lib/$prg"
54+
domain=example.com
55+
4556
promptok() {
4657
read -ep "Continue? [y/n] "
4758
[[ $REPLY == y ]] || exit 1

modules/cfg.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
from . import string_ops as c
1414

1515
# Version info
16-
__version__ = '0.10.0~rc'
17-
__date__ = '2016/01/30'
16+
__version__ = '0.10.0'
17+
__date__ = '2016/02/02'
1818

1919
# All references to program name should use this
2020
prog = 'upvm'

0 commit comments

Comments
 (0)