commit 750cae0d91cb6571c96e59ecda775f97d03dd186
author Jakub Josef <jjosef@mirantis.com> Wed Dec 27 18:05:45 2017 +0000
committer Gerrit Code Review <gerrit2@e9aa877068d1> Wed Dec 27 18:05:45 2017 +0000
tree 6a9008d0aba471ece6bfb048e4bed9d2909c7f17
parent 0fc2a444f36d6fec871f68c9a95c5b8bf1e9a3b5
parent b2865a11bd8d9cefb8e38e5ac5178684c37ee03d

Merge "define endpoint type for os cloud in Janitor"

docker/swarm/stack/janitor_monkey.yml

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}