From 94699fc5a2b47f40067348a60a8af562f0b79f0c Mon Sep 17 00:00:00 2001 From: Kyr Shatskyy Date: Tue, 16 Oct 2018 12:39:19 +0200 Subject: [PATCH] teuthology-openstack: add nameserver option Add --nameserver option to teuthology-openstack cli tool so teuthology cluster can be deployed and configured to use customly provided dns Signed-off-by: Kyr Shatskyy --- scripts/openstack.py | 4 ++++ teuthology/openstack/__init__.py | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/scripts/openstack.py b/scripts/openstack.py index f8e0cd5e..028a436b 100644 --- a/scripts/openstack.py +++ b/scripts/openstack.py @@ -196,6 +196,10 @@ def get_openstack_parser(): help='OpenStack primary instance name', default='teuthology', ) + parser.add_argument( + '--nameserver', + help='nameserver ip address (optional)', + ) parser.add_argument( '--simultaneous-jobs', help='maximum number of jobs running in parallel', diff --git a/teuthology/openstack/__init__.py b/teuthology/openstack/__init__.py index eb9cbc60..f8876646 100644 --- a/teuthology/openstack/__init__.py +++ b/teuthology/openstack/__init__.py @@ -825,6 +825,7 @@ class TeuthologyOpenStack(OpenStack): ] while len(original_argv) > 0: if original_argv[0] in ('--name', + '--nameserver', '--conf', '--teuthology-branch', '--teuthology-git-url', @@ -1101,6 +1102,9 @@ ssh access : ssh {identity}{username}@{ip} # logs in /usr/share/nginx/ all_options += [ '--network ' + network ] if self.args.simultaneous_jobs: all_options += [ '--nworkers ' + str(self.args.simultaneous_jobs) ] + if self.args.nameserver: + all_options += [ '--nameserver %s' % self.args.nameserver] + cmds = [ "su - -c '(set -x ; %s && cd teuthology && ./bootstrap install)' " -- 2.47.3