Merge pull request #300 from flor3k/patch-1
Adding sflorczak
diff --git a/docker/swarm/stack/janitor_monkey.yml b/docker/swarm/stack/janitor_monkey.yml
index 2e5698a..1152841 100644
--- a/docker/swarm/stack/janitor_monkey.yml
+++ b/docker/swarm/stack/janitor_monkey.yml
@@ -33,6 +33,7 @@
username: admin
password: password
ssl_verify: False
+ endpoint_type: public
source_credentials: /srv/volumes/rundeck/storage/content/cis/openstack
service_credentials: /opt/os_creds
docker:
@@ -56,6 +57,7 @@
simianarmy.client.cloudfire.region: ${_param:janitor_monkey_cloudfire_region}
simianarmy.client.cloudfire.cis.clustername: ${_param:janitor_monkey_cis_clustername}
simianarmy.client.cloudfire.identityEndpoint: ${_param:janitor_monkey_openstack:auth_url}
+ simianarmy.client.cloudfire.identityEndpointType: ${_param:janitor_monkey_openstack:endpoint_type}
simianarmy.client.cloudfire.accountKey: ${_param:janitor_monkey_openstack:username}
simianarmy.client.cloudfire.secretKey: ${_param:janitor_monkey_openstack:password}
simianarmy.client.cloudfire.domain: ${_param:janitor_monkey_openstack:project_domain_name}
diff --git a/jenkins/client/job/deploy/lab/deploy.yml b/jenkins/client/job/deploy/lab/deploy.yml
index 751089a..b6bbc71 100644
--- a/jenkins/client/job/deploy/lab/deploy.yml
+++ b/jenkins/client/job/deploy/lab/deploy.yml
@@ -90,6 +90,10 @@
type: text
default: ""
description: "YAML with overrides for Salt deployment"
+ BOOTSTRAP_EXTRA_REPO_PARAMS:
+ type: string
+ default: ""
+ description: "Defines a list of extra repos with parameters, format: repo 1, repo priority 1, repo pin 1; repo 2, repo priority 2, repo pin 2"
FORMULA_PKG_REVISION:
type: string
default: ""