X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jenkins-admin%2Fcreate_jenkins_clouds_openstack_yaml.py;h=ea92aa7cdcef6e221162e204b39a77175925cf11;hb=86f276e966e01b037d96a1a87cb6ad1fce18f7cc;hp=2d81a2500064e7a017561f14ee4519c7a499f867;hpb=ae9f2f497f6a9c036fc9ffaf4f95d72a0cab6f2e;p=releng%2Fglobal-jjb.git diff --git a/jenkins-admin/create_jenkins_clouds_openstack_yaml.py b/jenkins-admin/create_jenkins_clouds_openstack_yaml.py index 2d81a250..ea92aa7c 100755 --- a/jenkins-admin/create_jenkins_clouds_openstack_yaml.py +++ b/jenkins-admin/create_jenkins_clouds_openstack_yaml.py @@ -58,7 +58,7 @@ jenkins: credentialsId: {{ cloud_credential_id }} endPointUrl: {{ cloud_url }} ignoreSsl: {{ cloud_ignore_ssl }} - name: "cattle" + name: {{ cloud_name }} slaveOptions: availabilityZone: {{ availability_zone }} bootSource: @@ -117,8 +117,15 @@ def parse_arguments(): parser.add_argument('--path', type=dir_path, help="Path to jenkins-admin directory") - parser.add_argument('--sandbox', type=bool, default=False, - help="Set to True for sandbox yaml generation") + parser.add_argument('--name', type=str, + help="cloud name IE: cattle") + + parser.add_argument( + "-s", "--sandbox", + help = "Is configuration being created for a sandbox", + dest = "sandbox", action = "store_true" + ) + return parser.parse_args() parsed_args = parse_arguments() @@ -173,7 +180,9 @@ for filename in glob.iglob(path, recursive=True): # Global cloud config section for section in config_parser_merged.sections(): if section == "cloud": - final = (config.items(section)) + afinal = (config.items(section)) + name = parsed_args.name + final = (*afinal, ("cloud_name", name)) for index, _ in enumerate(final):