Replace git.openstack.org URLs with opendev.org URLs
Change-Id: Ia026c815fb05f787ee0ccc8921dee66ded2f6fb3
This commit is contained in:
jacky06
parent
e4dec38469
commit
b8efc5f4e0
|
|
@ -46,7 +46,7 @@ Osbash is written in BASH and follows conventions of DevStack:
|
|||
`devstack <http://devstack.org/>`_.
|
||||
|
||||
DevStack bash style guidelines can be found at the bottom of:
|
||||
https://git.openstack.org/cgit/openstack-dev/devstack/blob/master/HACKING.rst
|
||||
https://opendev.org/openstack/devstack/src/branch/master/HACKING.rst
|
||||
|
||||
Structure
|
||||
---------
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ see the
|
|||
|
||||
* Free software: Apache license
|
||||
* `Documentation:openstack-training-labs <https://docs.openstack.org/training_labs/>`_
|
||||
* `Source:openstack/training-labs <https://git.openstack.org/cgit/openstack/training-labs>`_
|
||||
* `Source:openstack/training-labs <https://opendev.org/openstack/training-labs>`_
|
||||
* `Bugs:openstack-training-labs <https://bugs.launchpad.net/labs>`_
|
||||
* `Release Notes:openstack-training-labs <https://docs.openstack.org/releasenotes/openstack-manuals/>`_
|
||||
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@
|
|||
readonly ISO_URL=https://buildlogs.centos.org/rolling/7/isos/x86_64/CentOS-7-x86_64-DVD-1511.iso
|
||||
readonly ISO_MD5=c875b0f1dabda14f00a3e261d241f63e
|
||||
|
||||
readonly _KS_ssh=http://git.openstack.org/cgit/openstack/training-labs/plain/labs/osbash/lib/osbash/netboot/ks-ssh-v2.cfg
|
||||
readonly _KS_vbadd=http://git.openstack.org/cgit/openstack/training-labs/plain/labs/osbash/lib/osbash/netboot/ks-vbadd.cfg
|
||||
readonly _KS_all=http://git.openstack.org/cgit/openstack/training-labs/plain/labs/osbash/lib/osbash/netboot/ks-all-v2.cfg
|
||||
readonly _KS_ssh=https://opendev.org/openstack/training-labs/raw/branch/master/labs/osbash/lib/osbash/netboot/ks-ssh-v2.cfg
|
||||
readonly _KS_vbadd=https://opendev.org/openstack/training-labs/raw/branch/master/labs/osbash/lib/osbash/netboot/ks-vbadd.cfg
|
||||
readonly _KS_all=https://opendev.org/openstack/training-labs/raw/branch/master/labs/osbash/lib/osbash/netboot/ks-all-v2.cfg
|
||||
|
||||
readonly _BOOT_ARGS="linux ks=%s"
|
||||
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@
|
|||
readonly ISO_URL=http://releases.ubuntu.com/12.04/ubuntu-12.04.4-server-amd64.iso
|
||||
|
||||
# Note: Ubuntu 12.04 LTS cannot pull a preseed file over HTTPS
|
||||
readonly _PS_ssh=http://git.openstack.org/cgit/openstack/training-labs/plain/labs/osbash/lib/osbash/netboot/preseed-ssh-v2.cfg
|
||||
readonly _PS_vbadd=http://git.openstack.org/cgit/openstack/training-labs/plain/labs/osbash/lib/osbash/netboot/preseed-vbadd.cfg
|
||||
readonly _PS_all=http://git.openstack.org/cgit/openstack/training-labs/plain/labs/osbash/lib/osbash/netboot/preseed-all-v2.cfg
|
||||
readonly _PS_ssh=https://opendev.org/openstack/training-labs/raw/branch/master/labs/osbash/lib/osbash/netboot/preseed-ssh-v2.cfg
|
||||
readonly _PS_vbadd=https://opendev.org/openstack/training-labs/raw/branch/master/labs/osbash/lib/osbash/netboot/preseed-vbadd.cfg
|
||||
readonly _PS_all=https://opendev.org/openstack/training-labs/raw/branch/master/labs/osbash/lib/osbash/netboot/preseed-all-v2.cfg
|
||||
|
||||
readonly _BOOT_ARGS="/install/vmlinuz
|
||||
noapic
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@ readonly ISO_URL_BASE=http://releases.ubuntu.com/14.04
|
|||
ISO_URL=$ISO_URL_BASE/ubuntu-14.04.5-server-amd64.iso
|
||||
ISO_MD5=dd54dc8cfc2a655053d19813c2f9aa9f
|
||||
|
||||
readonly _PS_ssh=http://git.openstack.org/cgit/openstack/training-labs/plain/labs/osbash/lib/osbash/netboot/preseed-ssh-v4.cfg
|
||||
readonly _PS_vbadd=http://git.openstack.org/cgit/openstack/training-labs/plain/labs/osbash/lib/osbash/netboot/preseed-vbadd.cfg
|
||||
readonly _PS_all=http://git.openstack.org/cgit/openstack/training-labs/plain/labs/osbash/lib/osbash/netboot/preseed-all-v2.cfg
|
||||
readonly _PS_ssh=https://opendev.org/openstack/training-labs/raw/branch/master/labs/osbash/lib/osbash/netboot/preseed-ssh-v4.cfg
|
||||
readonly _PS_vbadd=https://opendev.org/openstack/training-labs/raw/branch/master/labs/osbash/lib/osbash/netboot/preseed-vbadd.cfg
|
||||
readonly _PS_all=https://opendev.org/openstack/training-labs/raw/branch/master/labs/osbash/lib/osbash/netboot/preseed-all-v2.cfg
|
||||
|
||||
# Arguments for ISO image installer
|
||||
readonly _BOOT_ARGS="/install/vmlinuz
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@ readonly ISO_URL_BASE=http://releases.ubuntu.com/14.04
|
|||
ISO_URL=$ISO_URL_BASE/ubuntu-14.04.5-server-i386.iso
|
||||
ISO_MD5=812ac191b8898b33aed4aef9ab066b5a
|
||||
|
||||
readonly _PS_ssh=http://git.openstack.org/cgit/openstack/training-labs/plain/labs/osbash/lib/osbash/netboot/preseed-ssh-v4.cfg
|
||||
readonly _PS_vbadd=http://git.openstack.org/cgit/openstack/training-labs/plain/labs/osbash/lib/osbash/netboot/preseed-vbadd.cfg
|
||||
readonly _PS_all=http://git.openstack.org/cgit/openstack/training-labs/plain/labs/osbash/lib/osbash/netboot/preseed-all-v2.cfg
|
||||
readonly _PS_ssh=https://opendev.org/openstack/training-labs/raw/branch/master/labs/osbash/lib/osbash/netboot/preseed-ssh-v4.cfg
|
||||
readonly _PS_vbadd=https://opendev.org/openstack/training-labs/raw/branch/master/labs/osbash/lib/osbash/netboot/preseed-vbadd.cfg
|
||||
readonly _PS_all=https://opendev.org/openstack/training-labs/raw/branch/master/labs/osbash/lib/osbash/netboot/preseed-all-v2.cfg
|
||||
|
||||
# Arguments for ISO image installer
|
||||
readonly _BOOT_ARGS="/install/vmlinuz
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@ readonly ISO_URL_BASE=http://releases.ubuntu.com/16.04
|
|||
ISO_URL=$ISO_URL_BASE/ubuntu-16.04.5-server-amd64.iso
|
||||
ISO_MD5=24636fd103a2a43c95659f1c3c63718e
|
||||
|
||||
readonly _PS_ssh=http://git.openstack.org/cgit/openstack/training-labs/plain/labs/osbash/lib/osbash/netboot/preseed-ssh-v6.cfg
|
||||
readonly _PS_vbadd=http://git.openstack.org/cgit/openstack/training-labs/plain/labs/osbash/lib/osbash/netboot/preseed-vbadd-v6.cfg
|
||||
readonly _PS_all=http://git.openstack.org/cgit/openstack/training-labs/plain/labs/osbash/lib/osbash/netboot/preseed-all-v6.cfg
|
||||
readonly _PS_ssh=https://opendev.org/openstack/training-labs/raw/branch/master/labs/osbash/lib/osbash/netboot/preseed-ssh-v6.cfg
|
||||
readonly _PS_vbadd=https://opendev.org/openstack/training-labs/raw/branch/master/labs/osbash/lib/osbash/netboot/preseed-vbadd-v6.cfg
|
||||
readonly _PS_all=https://opendev.org/openstack/training-labs/raw/branch/master/labs/osbash/lib/osbash/netboot/preseed-all-v6.cfg
|
||||
|
||||
# Arguments for ISO image installer
|
||||
readonly _BOOT_ARGS="/install/vmlinuz
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@ readonly ISO_URL_BASE=http://releases.ubuntu.com/16.04
|
|||
ISO_URL=$ISO_URL_BASE/ubuntu-16.04.5-server-i386.iso
|
||||
ISO_MD5=9ba5fefe27685ae69f991c45396080af
|
||||
|
||||
readonly _PS_ssh=http://git.openstack.org/cgit/openstack/training-labs/plain/labs/osbash/lib/osbash/netboot/preseed-ssh-v6.cfg
|
||||
readonly _PS_vbadd=http://git.openstack.org/cgit/openstack/training-labs/plain/labs/osbash/lib/osbash/netboot/preseed-vbadd-v6.cfg
|
||||
readonly _PS_all=http://git.openstack.org/cgit/openstack/training-labs/plain/labs/osbash/lib/osbash/netboot/preseed-all-v6.cfg
|
||||
readonly _PS_ssh=https://opendev.org/openstack/training-labs/raw/branch/master/labs/osbash/lib/osbash/netboot/preseed-ssh-v6.cfg
|
||||
readonly _PS_vbadd=https://opendev.org/openstack/training-labs/raw/branch/master/labs/osbash/lib/osbash/netboot/preseed-vbadd-v6.cfg
|
||||
readonly _PS_all=https://opendev.org/openstack/training-labs/raw/branch/master/labs/osbash/lib/osbash/netboot/preseed-all-v6.cfg
|
||||
|
||||
# Arguments for ISO image installer
|
||||
readonly _BOOT_ARGS="/install/vmlinuz
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ logvol / --fstype=ext4 --name=root --vgname=ROOTDISK --size=1 --grow
|
|||
%post --interpreter=/bin/bash
|
||||
DIR=/home/osbash/.ssh
|
||||
mkdir $DIR
|
||||
wget -O $DIR/authorized_keys https://git.openstack.org/cgit/openstack/training-labs/plain/labs/osbash/lib/osbash-ssh-keys/osbash_key.pub
|
||||
wget -O $DIR/authorized_keys https://opendev.org/openstack/training-labs/raw/branch/master/labs/osbash/lib/osbash-ssh-keys/osbash_key.pub
|
||||
chmod 700 $DIR
|
||||
chmod 400 $DIR/authorized_keys
|
||||
chown -R osbash:osbash $DIR
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ logvol / --fstype=ext4 --name=root --vgname=ROOTDISK --size=1 --grow
|
|||
%post --interpreter=/bin/bash
|
||||
DIR=/home/osbash/.ssh
|
||||
mkdir $DIR
|
||||
wget -O $DIR/authorized_keys https://git.openstack.org/cgit/openstack/training-labs/plain/labs/osbash/lib/osbash-ssh-keys/osbash_key.pub
|
||||
wget -O $DIR/authorized_keys https://opendev.org/openstack/training-labs/raw/branch/master/labs/osbash/lib/osbash-ssh-keys/osbash_key.pub
|
||||
chmod 700 $DIR
|
||||
chmod 400 $DIR/authorized_keys
|
||||
chown -R osbash:osbash $DIR
|
||||
|
|
|
|||
|
|
@ -117,4 +117,4 @@ d-i debian-installer/add-kernel-opts string vga=0x301 nomodeset
|
|||
# still a usable /target directory. You can chroot to /target and use it
|
||||
# directly, or use the apt-install and in-target commands to easily install
|
||||
# packages and run commands in the target system.
|
||||
d-i preseed/late_command string echo "DIR=/home/osbash/.ssh; mkdir \$DIR; wget -O \$DIR/authorized_keys https://git.openstack.org/cgit/openstack/training-labs/plain/labs/osbash/lib/osbash-ssh-keys/osbash_key.pub ; chmod 700 \$DIR; chmod 400 \$DIR/authorized_keys; chown -R osbash:osbash \$DIR; echo 'osbash ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers; echo 'Defaults:osbash !requiretty' >> /etc/sudoers; apt-get -y purge virtualbox-guest-dkms virtualbox-guest-utils; mount /dev/sr1 /mnt; /mnt/VBoxLinuxAdditions.run; umount /mnt; echo -e '#!/bin/bash\nexec > /root/bootstrap.log 2>&1\nset -x\nSCR=/media/sf_bootstrap/autostart/*activate_autostart.sh\nwhile [ ! -f \$SCR ];do sleep 1;done\nbash \$SCR\nrm -v \$SCR' > /etc/rc2.d/S40osbash; chmod 755 /etc/rc2.d/S40osbash;" | chroot /target /bin/bash;
|
||||
d-i preseed/late_command string echo "DIR=/home/osbash/.ssh; mkdir \$DIR; wget -O \$DIR/authorized_keys https://opendev.org/openstack/training-labs/raw/branch/master/labs/osbash/lib/osbash-ssh-keys/osbash_key.pub ; chmod 700 \$DIR; chmod 400 \$DIR/authorized_keys; chown -R osbash:osbash \$DIR; echo 'osbash ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers; echo 'Defaults:osbash !requiretty' >> /etc/sudoers; apt-get -y purge virtualbox-guest-dkms virtualbox-guest-utils; mount /dev/sr1 /mnt; /mnt/VBoxLinuxAdditions.run; umount /mnt; echo -e '#!/bin/bash\nexec > /root/bootstrap.log 2>&1\nset -x\nSCR=/media/sf_bootstrap/autostart/*activate_autostart.sh\nwhile [ ! -f \$SCR ];do sleep 1;done\nbash \$SCR\nrm -v \$SCR' > /etc/rc2.d/S40osbash; chmod 755 /etc/rc2.d/S40osbash;" | chroot /target /bin/bash;
|
||||
|
|
|
|||
|
|
@ -117,4 +117,4 @@ d-i debian-installer/add-kernel-opts string vga=0x301 nomodeset
|
|||
# still a usable /target directory. You can chroot to /target and use it
|
||||
# directly, or use the apt-install and in-target commands to easily install
|
||||
# packages and run commands in the target system.
|
||||
d-i preseed/late_command string echo "DIR=/home/osbash/.ssh; mkdir \$DIR; wget -O \$DIR/authorized_keys https://git.openstack.org/cgit/openstack/training-labs/plain/labs/osbash/lib/osbash-ssh-keys/osbash_key.pub ; chmod 700 \$DIR; chmod 400 \$DIR/authorized_keys; chown -R osbash:osbash \$DIR; echo 'osbash ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers; echo 'Defaults:osbash !requiretty' >> /etc/sudoers;" | chroot /target /bin/bash;
|
||||
d-i preseed/late_command string echo "DIR=/home/osbash/.ssh; mkdir \$DIR; wget -O \$DIR/authorized_keys https://opendev.org/openstack/training-labs/raw/branch/master/labs/osbash/lib/osbash-ssh-keys/osbash_key.pub ; chmod 700 \$DIR; chmod 400 \$DIR/authorized_keys; chown -R osbash:osbash \$DIR; echo 'osbash ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers; echo 'Defaults:osbash !requiretty' >> /etc/sudoers;" | chroot /target /bin/bash;
|
||||
|
|
|
|||
|
|
@ -122,4 +122,4 @@ d-i debian-installer/add-kernel-opts string vga=0x301 nomodeset
|
|||
# still a usable /target directory. You can chroot to /target and use it
|
||||
# directly, or use the apt-install and in-target commands to easily install
|
||||
# packages and run commands in the target system.
|
||||
d-i preseed/late_command string echo "DIR=/home/osbash/.ssh; mkdir \$DIR; wget -O \$DIR/authorized_keys https://git.openstack.org/cgit/openstack/training-labs/plain/labs/osbash/lib/osbash-ssh-keys/osbash_key.pub ; chmod 700 \$DIR; chmod 400 \$DIR/authorized_keys; chown -R osbash:osbash \$DIR; echo 'osbash ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers; echo 'Defaults:osbash !requiretty' >> /etc/sudoers;" | chroot /target /bin/bash;
|
||||
d-i preseed/late_command string echo "DIR=/home/osbash/.ssh; mkdir \$DIR; wget -O \$DIR/authorized_keys https://opendev.org/openstack/training-labs/raw/branch/master/labs/osbash/lib/osbash-ssh-keys/osbash_key.pub ; chmod 700 \$DIR; chmod 400 \$DIR/authorized_keys; chown -R osbash:osbash \$DIR; echo 'osbash ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers; echo 'Defaults:osbash !requiretty' >> /etc/sudoers;" | chroot /target /bin/bash;
|
||||
|
|
|
|||
|
|
@ -63,8 +63,8 @@ class ISOImage(distro.GenericISOImage):
|
|||
|
||||
logger.info("New ISO URL:\n\t%s", self.url)
|
||||
|
||||
PRESEED_HOST_DIR = ("http://git.openstack.org/cgit/openstack/training-labs/"
|
||||
"plain/labs/osbash/lib/osbash/netboot/")
|
||||
PRESEED_HOST_DIR = ("https://opendev.org/openstack/training-labs/"
|
||||
"src/branch/master/labs/osbash/lib/osbash/netboot/")
|
||||
|
||||
PRESEED_URL = {}
|
||||
PRESEED_URL['ssh'] = PRESEED_HOST_DIR + "preseed-ssh-v4.cfg"
|
||||
|
|
|
|||
|
|
@ -63,8 +63,8 @@ class ISOImage(distro.GenericISOImage):
|
|||
|
||||
logger.info("New ISO URL:\n\t%s", self.url)
|
||||
|
||||
PRESEED_HOST_DIR = ("http://git.openstack.org/cgit/openstack/training-labs/"
|
||||
"plain/labs/osbash/lib/osbash/netboot/")
|
||||
PRESEED_HOST_DIR = ("https://opendev.org/openstack/training-labs/"
|
||||
"src/branch/master/labs/osbash/lib/osbash/netboot/")
|
||||
|
||||
PRESEED_URL = {}
|
||||
PRESEED_URL['ssh'] = PRESEED_HOST_DIR + "preseed-ssh-v4.cfg"
|
||||
|
|
|
|||
Loading…
Reference in New Issue