commit ede5cffab071c710bb60838b6eb0c057e7dc8c8f
author Ondrej Smola <osmola@mirantis.com> Mon Jul 30 12:04:51 2018 +0000
committer Gerrit Code Review <gerrit2@84b5d06f6116> Mon Jul 30 12:04:51 2018 +0000
tree 200cc35bc3b3b844d77adaaf10e33612f6394e70
parent 9a6606828755772c5f103bed001e69271d7dc336
parent 0af84f5d7828709e38b483d93a3ec30f62c29b59

Merge "Fix keycloak proxy image"

docker/swarm/stack/keycloak.yml

diff --git a/docker/swarm/stack/keycloak.yml b/docker/swarm/stack/keycloak.yml
index 0187a08..c712fda 100644
--- a/docker/swarm/stack/keycloak.yml
+++ b/docker/swarm/stack/keycloak.yml
@@ -1,15 +1,21 @@
 parameters:
   _param:
-    docker_keycloak_server_replicas: 3
+    docker_keycloak_server_replicas: 1
     docker_keycloak_proxy_replicas: 1
     docker_image_keycloak_server: jboss/keycloak:3.4.2.Final
-    docker_image_keycloak_proxy: jboss/keycloak-proxy:3.4.2.h
+    docker_image_keycloak_proxy: jboss/keycloak-proxy:3.4.2.Final
     keycloak_bind_port: ${_param:haproxy_keycloak_bind_port}
     keycloak_proxy_bind_port: ${_param:haproxy_keycloak_proxy_bind_port}
+    # Initial admin support
+    keycloak_admin_username: admin
+    keycloak_admin_password: password
   docker:
     client:
       stack:
         keycloak:
+          environment:
+            KEYCLOAK_USER: ${_param:keycloak_admin_username}
+            KEYCLOAK_PASSWORD: ${_param:keycloak_admin_password}
           service:
             keycloak-server:
               image: ${_param:docker_image_keycloak_server}

haproxy/proxy/listen/keycloak.yml

diff --git a/haproxy/proxy/listen/keycloak.yml b/haproxy/proxy/listen/keycloak.yml
index 73697a3..89a9670 100644
--- a/haproxy/proxy/listen/keycloak.yml
+++ b/haproxy/proxy/listen/keycloak.yml
@@ -1,7 +1,7 @@
 parameters:
   _param:
     haproxy_keycloak_bind_host: ${_param:haproxy_bind_address}
-    haproxy_keycloak_bind_port: 8086
+    haproxy_keycloak_bind_port: 8080
     haproxy_keycloak_exposed_port: 18086
     haproxy_keycloak_ssl:
       enabled: false