Commit 69f128a7 authored by Thomas Goirand's avatar Thomas Goirand

Add option to include incoming buildd, so it's easier to test in Sid.

parent 0e08a90d
......@@ -103,6 +103,14 @@ deb-src http://${debian_release}-${openstack_release}.debian.net/debian ${debian
fi
fi
if [ "${install_buildd_incoming}" = "yes" ] ; then
echo "deb ${debian_incoming_buildd} buildd-sid main
deb-src ${debian_incoming_buildd} buildd-sid main
" >${BODI_CHROOT_PATH}/etc/apt/sources.list.d/incoming-buildd.list
chroot ${BODI_CHROOT_PATH} apt-get update
chroot ${BODI_CHROOT_PATH} apt-get -y -o Dpkg::Options::="--force-confnew" dist-upgrade
fi
# Copy files under /oci-in-target to the root of the target
if [ -d /oci-in-target ] ; then
CWD=$(pwd)
......
......@@ -106,6 +106,12 @@ echo "deb ${OTCI_DEB_MIRROR_ADDR} ${debian_release} contrib non-free
deb-src ${OTCI_DEB_MIRROR_ADDR} ${debian_release} contrib non-free
" >config/archives/contrib-non-free.list.chroot
if [ "${install_buildd_incoming}" = "yes" ] ; then
echo "deb ${debian_incoming_buildd} buildd-sid main
deb-src ${debian_incoming_buildd} buildd-sid main
" >config/archives/incoming-buildd.list.chroot
fi
# Copy the agent
mkdir -p config/includes.chroot/usr/bin
cp /usr/bin/openstack-cluster-installer-agent config/includes.chroot/usr/bin
......
openstack-cluster-installer (9) UNRELEASED; urgency=medium
* Automatically remove space in "connection = " in config file.
* Add option to include incoming buildd, so it's easier to test in Sid.
-- Thomas Goirand <zigo@debian.org> Thu, 25 Oct 2018 11:41:43 +0200
openstack-cluster-installer (8) unstable; urgency=medium
* Fixed Source URL in debian/copyright.
......
......@@ -24,6 +24,9 @@ debian_mirror=http://10.4.22.95:9999/debian
# URL of your debian security proxy/mirror
debian_security_mirror=http://10.4.22.95:9999/security
# URL of the incoming buildd repo
debian_incoming_buildd=http://10.4.22.95:9999/debian-buildd
# Address of the OCI web server that the agent will contact,
# and also the IP address of the puppet-master, as per slave
# nodes /etc/hosts file.
......@@ -84,6 +87,11 @@ debian_release=stretch
# Should we use a Debian stable unofficial repository?
use_debian_dot_net_backport=yes
# This is useful for development, when you want fast
# update of the package in the Sid Debian repository.
# Not to be used in production.
install_buildd_incoming=no
[ssh]
# If set to yes, will use the PHP extension
# otherwise, use PHP exec.
......
......@@ -11,20 +11,31 @@ fi
### SETUP REPOSITORIES ###
if [ "${use_debian_dot_net_backport}" = "yes" ] ; then
echo "deb http://${debian_release}-${openstack_release}.debian.net/debian ${debian_release}-${openstack_release}-backports main
deb-src http://${debian_release}-${openstack_release}.debian.net/debian ${debian_release}-${openstack_release}-backports main
echo "deb ${DEBIAN_DOT_NET_REPO} ${debian_release}-${openstack_release}-backports main
deb-src ${DEBIAN_DOT_NET_REPO} ${debian_release}-${openstack_release}-backports main
deb http://${debian_release}-${openstack_release}.debian.net/debian ${debian_release}-${openstack_release}-backports-nochange main
deb-src http://${debian_release}-${openstack_release}.debian.net/debian ${debian_release}-${openstack_release}-backports-nochange main
" >${BODI_CHROOT_PATH}/etc/apt/sources.list.d/openstack.list
deb ${DEBIAN_DOT_NET_REPO} ${debian_release}-${openstack_release}-backports-nochange main
deb-src ${DEBIAN_DOT_NET_REPO} ${debian_release}-${openstack_release}-backports-nochange main
" >${BODI_CHROOT_PATH}/etc/apt/sources.list.d/openstack.list
chroot ${BODI_CHROOT_PATH} apt-get update
chroot ${BODI_CHROOT_PATH} apt-get install --allow-unauthenticated -y openstack-backports-archive-keyring
chroot ${BODI_CHROOT_PATH} apt-get update
chroot ${BODI_CHROOT_PATH} apt-get -y dist-upgrade -o Dpkg::Options::="--force-confnew"
fi
if [ "${install_buildd_incoming}" = "yes" ] ; then
echo "deb ${DEBIAN_INCOMING_BUILDD} buildd-sid main
deb-src ${DEBIAN_INCOMING_BUILDD} buildd-sid main
" >${BODI_CHROOT_PATH}/etc/apt/sources.list.d/buildd-incoming.list
chroot ${BODI_CHROOT_PATH} apt-get update
chroot ${BODI_CHROOT_PATH} apt-get install --allow-unauthenticated -y openstack-backports-archive-keyring
chroot ${BODI_CHROOT_PATH} apt-get update
chroot ${BODI_CHROOT_PATH} apt-get -y dist-upgrade -o Dpkg::Options::="--force-confnew"
fi
### INSTALL openstack-cluster-installer ###
DEBIAN_FRONTEND=noninteractive chroot ${BODI_CHROOT_PATH} apt-get install -y openstack-cluster-installer
DEBIAN_FRONTEND=noninteractive chroot ${BODI_CHROOT_PATH} apt-get install -y -o Dpkg::Options::="--force-confnew" openstack-cluster-installer
# configure it with the settings from oci-poc
sed -i "s#^OPENSTACK_CLUSTER_NETWORK=.*#OPENSTACK_CLUSTER_NETWORK=${HOST_BRIDGE_NET}#" ${BODI_CHROOT_PATH}/etc/openstack-cluster-installer/openstack-cluster-installer.conf
......@@ -35,6 +46,7 @@ sed -i "s#^OCI_IP=.*#OCI_IP=${OCI_VM_IP}#" ${BODI_CHROOT_PATH}/etc/openstack-clu
sed -i "s#^openstack_release=.*#openstack_release=${openstack_release}#" ${BODI_CHROOT_PATH}/etc/openstack-cluster-installer/openstack-cluster-installer.conf
sed -i "s#^use_debian_dot_net_backport=.*#use_debian_dot_net_backport=${use_debian_dot_net_backport}#" ${BODI_CHROOT_PATH}/etc/openstack-cluster-installer/openstack-cluster-installer.conf
sed -i "s#^debian_release=.*#debian_release=${debian_release}#" ${BODI_CHROOT_PATH}/etc/openstack-cluster-installer/openstack-cluster-installer.conf
sed -i "s#^install_buildd_incoming=.*#install_buildd_incoming=${install_buildd_incoming}#" ${BODI_CHROOT_PATH}/etc/openstack-cluster-installer/openstack-cluster-installer.conf
### CONFIGURE isc-dhcpd ###
sed -i 's/INTERFACESv4=.*/INTERFACESv4="eth0"/' ${BODI_CHROOT_PATH}/etc/default/isc-dhcp-server
......
......@@ -47,10 +47,21 @@ HOST_BRIDGE_NAME=ocibr0
# it will be post-fixed with a number, like ocivm0
GUEST_TAPIF_PREFIX=ocivmtap
#####################
### Release names ###
#####################
# Name of the OpenStack release for the backport repository
openstack_release=rocky
# Name of the Debian distribution for the backport repository.
# Can be set to sid for development purpose.
debian_release=stretch
#################################
### Debian mirror definitions ###
#################################
# IP or hostname of your Debian mirror
# IP or hostname of your Debian mirror. Usually set to
# an approx IP:port
DEBIAN_MIRROR_HOST=10.4.22.95:9999
# Debian mirror close to you. Hint: use approx or apt-cacher.
......@@ -59,6 +70,20 @@ DEBIAN_MIRROR=http://${DEBIAN_MIRROR_HOST}/debian
# Debian security mirror close to you. Hint: use approx or apt-cacher.
DEBIAN_SECURITY_MIRROR=http://${DEBIAN_MIRROR_HOST}/security
# Unofficial debian.net Stable backports
DEBIAN_DOT_NET_REPO=http://${debian_release}-${openstack_release}.debian.net/debian
# Incoming buildd address. Normally:
# http://incoming.debian.org/debian-buildd
DEBIAN_INCOMING_BUILDD=http://${DEBIAN_MIRROR_HOST}/debian-buildd
# Use the above repository?
use_debian_dot_net_backport=yes
# This is useful for development, when you want fast
# update of the package in the Sid Debian repository.
install_buildd_incoming=no
########################
### Slave node range ###
########################
......@@ -76,12 +101,3 @@ GUEST_LAST_SLAVE_IP=${HOST_NETWORK_PREFIX}.250
GUEST_MAC_ADDRESS_PREFIX=08:00:27:06:CC:
GUEST_MAC_ADDRESS_PREFIX2=08:00:27:06:DC:
#####################
### Release names ###
#####################
openstack_release=rocky
debian_release=stretch
use_debian_dot_net_backport=yes
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment