From 07d5f1c3e1b352cb713852a3a96022ddb8fe2676 Mon Sep 17 00:00:00 2001 From: Aleksandra Fedorova Date: Wed, 23 Dec 2015 14:55:01 +0300 Subject: [PATCH 1/2] Switch all repositories to stable/8.0 Change-Id: Ib109f9276e3ea7d63c516cce44af8bb99468e529 --- config.mk | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/config.mk b/config.mk index 66ab7f203..913d04354 100644 --- a/config.mk +++ b/config.mk @@ -86,18 +86,18 @@ DENY_RPM_DOWNGRADE?=1 NO_UI_OPTIMIZE:=0 # Repos and versions -FUELLIB_COMMIT?=master -NAILGUN_COMMIT?=master -PYTHON_FUELCLIENT_COMMIT?=master -FUEL_AGENT_COMMIT?=master -FUEL_NAILGUN_AGENT_COMMIT?=master -ASTUTE_COMMIT?=master -OSTF_COMMIT?=master -FUEL_MIRROR_COMMIT?=master -FUELMENU_COMMIT?=master -SHOTGUN_COMMIT?=master -NETWORKCHECKER_COMMIT?=master -FUELUPGRADE_COMMIT?=master +FUELLIB_COMMIT?=stable/8.0 +NAILGUN_COMMIT?=stable/8.0 +PYTHON_FUELCLIENT_COMMIT?=stable/8.0 +FUEL_AGENT_COMMIT?=stable/8.0 +FUEL_NAILGUN_AGENT_COMMIT?=stable/8.0 +ASTUTE_COMMIT?=stable/8.0 +OSTF_COMMIT?=stable/8.0 +FUEL_MIRROR_COMMIT?=stable/8.0 +FUELMENU_COMMIT?=stable/8.0 +SHOTGUN_COMMIT?=stable/8.0 +NETWORKCHECKER_COMMIT?=stable/8.0 +FUELUPGRADE_COMMIT?=stable/8.0 FUELLIB_REPO?=https://github.com/openstack/fuel-library.git NAILGUN_REPO?=https://github.com/openstack/fuel-web.git From 8d5a4688b89316ad72e952a85fef7e3b3d881fc1 Mon Sep 17 00:00:00 2001 From: Albert Date: Fri, 25 Dec 2015 10:27:44 +0200 Subject: [PATCH 2/2] Make the network script explicitly dependent on setup-bootdev to avoid race condition in systemd Change-Id: Ied870fe1b60e1e4da25c802bd6fdf1c0a55b4b83 Close-bug: #1526262 --- bootstrap/module.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bootstrap/module.mk b/bootstrap/module.mk index 41e78554f..7b2ff4434 100644 --- a/bootstrap/module.mk +++ b/bootstrap/module.mk @@ -171,6 +171,8 @@ $(BUILD_DIR)/bootstrap/customize-initram-root.done: \ # Enabling pre-init boot interface discovery #sudo chroot $(INITRAMROOT) chkconfig setup-bootdev on + # Make the network script dependent on the setup-bootdev for correst network starting + sudo sed -i -e 's|\(^# Should-Start:.*\)|\1 setup-bootdev|' $(INITRAMROOT)/etc/init.d/network # Setting root password into r00tme sudo sed -i -e '/^root/c\root:$$6$$oC7haQNQ$$LtVf6AI.QKn9Jb89r83PtQN9fBqpHT9bAFLzy.YVxTLiFgsoqlPY3awKvbuSgtxYHx4RUcpUqMotp.WZ0Hwoj.:15441:0:99999:7:::' $(INITRAMROOT)/etc/shadow