From 767bc4884dc925c9756510861e2869c77b1d24f0 Mon Sep 17 00:00:00 2001 From: Anton Chevychalov Date: Wed, 30 Nov 2016 17:45:04 +0300 Subject: [PATCH] [Jenkins] Fixes Fix url resolution (use moscow dns) Fix error in config Fix error in add_repo procedure Change-Id: I7512bdc24ddd435078dc24619a37ef4ad1c56770 --- jenkins/build_cluster/build_cluster.py | 7 ++++--- jenkins/build_cluster/config.xml | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/jenkins/build_cluster/build_cluster.py b/jenkins/build_cluster/build_cluster.py index 54820cc..283a96b 100755 --- a/jenkins/build_cluster/build_cluster.py +++ b/jenkins/build_cluster/build_cluster.py @@ -394,13 +394,14 @@ def send_keys(instance): " ip={ip}\n" " netmask={netmask}\n" " gw={gw}\n" - " dns1={gw}\n" + " dns1={dns}\n" " showmenu=no\n" " \n" ).format( ip=str(cfg["ADMIN_SUBNET"].ip + 2), netmask=str(cfg["ADMIN_SUBNET"].netmask), - gw=str(cfg["ADMIN_SUBNET"].ip + 1) + gw=str(cfg["ADMIN_SUBNET"].ip + 1), + dns="172.18.16.10", #Moscow DNS ) print (keys) key_codes = scancodes.from_string(str(keys)) @@ -736,7 +737,7 @@ def main(): pswd = cfg["FUEL_SSH_PASSWORD"],) if cfg["ADD_CENT_REPO"]!="": - add_cent_repo(cfg["ADD_CENT_REPO"]) + add_cent_repo(admin_node,cfg["ADD_CENT_REPO"]) if cfg["UPDATE_FUEL"]=="true": if do_update(admin_node): diff --git a/jenkins/build_cluster/config.xml b/jenkins/build_cluster/config.xml index 8262105..1349499 100644 --- a/jenkins/build_cluster/config.xml +++ b/jenkins/build_cluster/config.xml @@ -145,7 +145,7 @@ export PYTHONUNBUFFERED=1 curl -o ./build_cluster.py "https://raw.githubusercontent.com/Mirantis/tools-sustaining/master/jenkins/build_cluster/build_cluster.py" curl -o ./scancodes.py "https://raw.githubusercontent.com/Mirantis/tools-sustaining/master/jenkins/build_cluster/scancodes.py" curl -o ./update_helper.sh "https://raw.githubusercontent.com/Mirantis/tools-sustaining/master/jenkins/build_cluster/update_helper.sh" -curl -o ./update_helper.sh "https://raw.githubusercontent.com/Mirantis/tools-sustaining/master/jenkins/build_cluster/repo_helper.sh" +curl -o ./repo_helper.sh "https://raw.githubusercontent.com/Mirantis/tools-sustaining/master/jenkins/build_cluster/repo_helper.sh" chmod +x update_helper.sh chmod +x repo_helper.sh -- 2.45.2