commit 22de41c0bd8e6d35e45dbdadc87b8e400c3c5553
author Jakub Josef <jjosef@mirantis.com> Tue Sep 12 16:59:00 2017 +0000
committer Gerrit Code Review <gerrit2@b3fef64565ee> Tue Sep 12 16:59:04 2017 +0000
tree c4a1797fcfc02f116970465d138bfada3803490e
parent 976d9ff628d7a778520e6e08a50a5c053d4847ec
parent 7d6938e8f60c52b513a12813db3d2143aef917b0

Merge "rename var to provide common style in services"

docker/swarm/stack/gerrit.yml

diff --git a/docker/swarm/stack/gerrit.yml b/docker/swarm/stack/gerrit.yml
index b59172a..95bc233 100644
--- a/docker/swarm/stack/gerrit.yml
+++ b/docker/swarm/stack/gerrit.yml
@@ -7,7 +7,7 @@
     gerrit_ldap_bind_password: ""
     gerrit_ldap_account_base: ""
     gerrit_ldap_group_base: ""
-
+    gerrit_http_listen_url: http://*:8080/
   docker:
     client:
       stack:
@@ -40,6 +40,7 @@
                 LDAP_USERNAME: ${_param:gerrit_ldap_bind_user}
                 LDAP_PASSWORD: ${_param:gerrit_ldap_bind_password}
                 WEBURL: ${_param:gerrit_public_host}
+                HTTPD_LISTENURL: ${_param:gerrit_http_listen_url}
                 GERRIT_ADMIN_SSH_PUBLIC: ${_param:gerrit_admin_public_key}
                 GERRIT_ADMIN_PWD: ${_param:gerrit_admin_password}
                 GERRIT_ADMIN_EMAIL: ${_param:gerrit_admin_email}

docker/swarm/stack/security_monkey.yml

diff --git a/docker/swarm/stack/security_monkey.yml b/docker/swarm/stack/security_monkey.yml
index 33938b2..0fab44b 100644
--- a/docker/swarm/stack/security_monkey.yml
+++ b/docker/swarm/stack/security_monkey.yml
@@ -19,8 +19,6 @@
     security_monkey_nginx_port: ${_param:security_monkey_bind_port}
     devops_portal_sm_wtf_csrf_enabled: False
     security_monkey_sync_interval: 15
-    security_monkey_os_ssl_verify: False
-    security_monkey_os_endpoint_type: "public"
     security_monkey_openstack:
       os_account_id: mcp_cloud
       os_account_name: mcp_cloud
@@ -32,6 +30,8 @@
       user_domain_name: Default
       cacert_path: /srv/volumes/rundeck/storage/content/cis/openstack/cert.pem
       cafile: /opt/certs/cert.pem
+      endpoint_type: "public"
+      ssl_verify: False
   docker:
     client:
       stack:
@@ -56,8 +56,8 @@
             OS_AUTH_URL: ${_param:security_monkey_openstack:auth_url}
             OS_PROJECT_DOMAIN_NAME: ${_param:security_monkey_openstack:project_domain_name}
             OS_PROJECT_NAME: ${_param:security_monkey_openstack:project_name}
-            OS_SSL_VERIFY: ${_param:security_monkey_os_ssl_verify}
-            OS_ENDPOINT_TYPE: ${_param:security_monkey_os_endpoint_type}
+            OS_SSL_VERIFY: ${_param:security_monkey_openstack:ssl_verify}
+            OS_ENDPOINT_TYPE: ${_param:security_monkey_openstack:endpoint_type}
             CACERT_PATH: ${_param:security_monkey_openstack:cafile}
             USER_DOMAIN_NAME: ${_param:security_monkey_openstack:user_domain_name}
             SM_WTF_CSRF_ENABLED: ${_param:devops_portal_sm_wtf_csrf_enabled}