mirror of
https://github.com/gryf/boxpy.git
synced 2026-03-25 23:03:33 +01:00
Compare commits
3 Commits
cdcb7ffdce
...
1.6
| Author | SHA1 | Date | |
|---|---|---|---|
| f0282874f8 | |||
| 4db0b422b8 | |||
| c3ee529d95 |
7
box.py
7
box.py
@@ -978,7 +978,8 @@ class Image:
|
|||||||
return True
|
return True
|
||||||
|
|
||||||
fname = os.path.join(CACHE_DIR, self._img_fname)
|
fname = os.path.join(CACHE_DIR, self._img_fname)
|
||||||
LOG.header('Downloading image %s', self._img_fname)
|
LOG.header('Downloading image %s from %s', self._img_fname,
|
||||||
|
self._img_url)
|
||||||
Run(['wget', '-q', self._img_url, '-O', fname])
|
Run(['wget', '-q', self._img_url, '-O', fname])
|
||||||
|
|
||||||
if not self._checksum():
|
if not self._checksum():
|
||||||
@@ -1048,7 +1049,7 @@ class CentosStream(Image):
|
|||||||
IMG = '.*(CentOS-Stream-GenericCloud-%s-[0-9]+.[0-9].%s.qcow2).*'
|
IMG = '.*(CentOS-Stream-GenericCloud-%s-[0-9]+.[0-9].%s.qcow2).*'
|
||||||
CHKS = "CHECKSUM"
|
CHKS = "CHECKSUM"
|
||||||
|
|
||||||
def __init__(self, vbox, version, arch, release):
|
def __init__(self, vbox, version, arch, release, fname=None):
|
||||||
super().__init__(vbox, version, arch, release)
|
super().__init__(vbox, version, arch, release)
|
||||||
self._checksum_file = '%s-centos-stream-%s-%s' % (self.CHKS, version,
|
self._checksum_file = '%s-centos-stream-%s-%s' % (self.CHKS, version,
|
||||||
arch)
|
arch)
|
||||||
@@ -1104,7 +1105,7 @@ DISTROS = {'ubuntu': {'username': 'ubuntu',
|
|||||||
'realname': 'ubuntu',
|
'realname': 'ubuntu',
|
||||||
'img_class': Ubuntu,
|
'img_class': Ubuntu,
|
||||||
'amd64': 'amd64',
|
'amd64': 'amd64',
|
||||||
'default_version': '20.04'},
|
'default_version': '22.04'},
|
||||||
'fedora': {'username': 'fedora',
|
'fedora': {'username': 'fedora',
|
||||||
'realname': 'fedora',
|
'realname': 'fedora',
|
||||||
'img_class': Fedora,
|
'img_class': Fedora,
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ runcmd:
|
|||||||
- [apt, purge, '-y', python3-pyasn1-modules]
|
- [apt, purge, '-y', python3-pyasn1-modules]
|
||||||
- [apt, purge, '-y', python3-simplejson]
|
- [apt, purge, '-y', python3-simplejson]
|
||||||
- [su, -, ubuntu, -c, "git clone https://github.com/gryf/vmstrap"]
|
- [su, -, ubuntu, -c, "git clone https://github.com/gryf/vmstrap"]
|
||||||
- [su, -, ubuntu, -c, "vmstrap/bootstrap.sh"]
|
- [su, -, ubuntu, -c, "vmstrap/bootstrap.sh -c"]
|
||||||
- [rm, -fr, /home/ubuntu/vmstrap]
|
- [rm, -fr, /home/ubuntu/vmstrap]
|
||||||
- [su, -, ubuntu, -c, "cp /tmp/local.conf /home/ubuntu/devstack/"]
|
- [su, -, ubuntu, -c, "cp /tmp/local.conf /home/ubuntu/devstack/"]
|
||||||
- [su, -, ubuntu, -c, "echo 'export HOST_IP=10.0.2.15' >> .bashrc"]
|
- [su, -, ubuntu, -c, "echo 'export HOST_IP=10.0.2.15' >> .bashrc"]
|
||||||
|
|||||||
@@ -174,7 +174,7 @@ runcmd:
|
|||||||
- [apt, purge, '-y', python3-pyasn1-modules]
|
- [apt, purge, '-y', python3-pyasn1-modules]
|
||||||
- [apt, purge, '-y', python3-simplejson]
|
- [apt, purge, '-y', python3-simplejson]
|
||||||
- [su, -, ubuntu, -c, "git clone https://github.com/gryf/vmstrap"]
|
- [su, -, ubuntu, -c, "git clone https://github.com/gryf/vmstrap"]
|
||||||
- [su, -, ubuntu, -c, "vmstrap/bootstrap.sh"]
|
- [su, -, ubuntu, -c, "vmstrap/bootstrap.sh -c"]
|
||||||
- [rm, -fr, /home/ubuntu/vmstrap]
|
- [rm, -fr, /home/ubuntu/vmstrap]
|
||||||
- [su, -, ubuntu, -c, "echo 'export HOST_IP=192.168.10.10' >> .bashrc"]
|
- [su, -, ubuntu, -c, "echo 'export HOST_IP=192.168.10.10' >> .bashrc"]
|
||||||
- [su, -, ubuntu, -c, "cp /tmp/local.conf /home/ubuntu/devstack/"]
|
- [su, -, ubuntu, -c, "cp /tmp/local.conf /home/ubuntu/devstack/"]
|
||||||
@@ -186,3 +186,4 @@ boxpy_data:
|
|||||||
disk_size: 50GB
|
disk_size: 50GB
|
||||||
advanced:
|
advanced:
|
||||||
nic2: intnet
|
nic2: intnet
|
||||||
|
version: 20.04
|
||||||
|
|||||||
@@ -123,7 +123,7 @@ runcmd:
|
|||||||
- [apt, purge, '-y', python3-pyasn1-modules]
|
- [apt, purge, '-y', python3-pyasn1-modules]
|
||||||
- [apt, purge, '-y', python3-simplejson]
|
- [apt, purge, '-y', python3-simplejson]
|
||||||
- [su, -, ubuntu, -c, "git clone https://github.com/gryf/vmstrap"]
|
- [su, -, ubuntu, -c, "git clone https://github.com/gryf/vmstrap"]
|
||||||
- [su, -, ubuntu, -c, "vmstrap/bootstrap.sh"]
|
- [su, -, ubuntu, -c, "vmstrap/bootstrap.sh -c"]
|
||||||
- [rm, -fr, /home/ubuntu/vmstrap]
|
- [rm, -fr, /home/ubuntu/vmstrap]
|
||||||
- [su, -, ubuntu, -c, "echo 'export HOST_IP=192.168.10.11' >> .bashrc"]
|
- [su, -, ubuntu, -c, "echo 'export HOST_IP=192.168.10.11' >> .bashrc"]
|
||||||
- [su, -, ubuntu, -c, "cp /tmp/local.conf /home/ubuntu/devstack/"]
|
- [su, -, ubuntu, -c, "cp /tmp/local.conf /home/ubuntu/devstack/"]
|
||||||
@@ -135,3 +135,4 @@ boxpy_data:
|
|||||||
disk_size: 50GB
|
disk_size: 50GB
|
||||||
advanced:
|
advanced:
|
||||||
nic2: intnet
|
nic2: intnet
|
||||||
|
version: 20.04
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
packages:
|
packages:
|
||||||
- build-essential
|
- build-essential
|
||||||
|
- exuberant-ctags
|
||||||
- gettext
|
- gettext
|
||||||
- libfontconfig1-dev
|
- libfontconfig1-dev
|
||||||
- libgif-dev
|
- libgif-dev
|
||||||
@@ -21,12 +22,16 @@ packages:
|
|||||||
- libxrender-dev
|
- libxrender-dev
|
||||||
- libxt-dev
|
- libxt-dev
|
||||||
- make
|
- make
|
||||||
|
- mc
|
||||||
- sharutils
|
- sharutils
|
||||||
|
- silversearcher-ag
|
||||||
|
- tmux
|
||||||
|
- vim-nox
|
||||||
- xinit
|
- xinit
|
||||||
runcmd:
|
runcmd:
|
||||||
- [su, -, ubuntu, -c, "git clone https://github.com/gryf/wmaker -b experimental"]
|
- [su, -, ubuntu, -c, "git clone https://github.com/gryf/wmaker -b experimental"]
|
||||||
- [su, -, ubuntu, -c, "git clone https://github.com/gryf/vmstrap"]
|
- [su, -, ubuntu, -c, "git clone https://github.com/gryf/vmstrap"]
|
||||||
- [su, -, ubuntu, -c, "vmstrap/bootstrap.sh"]
|
- [su, -, ubuntu, -c, "vmstrap/bootstrap.sh -c"]
|
||||||
- [rm, -fr, /home/ubuntu/vmstrap]
|
- [rm, -fr, /home/ubuntu/vmstrap]
|
||||||
boxpy_data:
|
boxpy_data:
|
||||||
key: vm
|
key: vm
|
||||||
|
|||||||
Reference in New Issue
Block a user