Merge "Remove galera/mysql stuff from controllers"
diff --git a/docker/swarm/stack/gerrit.yml b/docker/swarm/stack/gerrit.yml
index 7985217..964899d 100644
--- a/docker/swarm/stack/gerrit.yml
+++ b/docker/swarm/stack/gerrit.yml
@@ -9,6 +9,9 @@
gerrit_ldap_group_base: ""
gerrit_http_listen_url: http://*:8080/
gerrit_extra_opts: ""
+ gerrit_db_publish_port: 13306
+ gerrit_publish_port: 18083
+ gerrit_ssh_publish_port: 29417
docker:
client:
stack:
@@ -20,8 +23,8 @@
condition: any
image: ${_param:docker_image_gerrit}
ports:
- - 18083:8080
- - 29417:29418
+ - ${_param:gerrit_publish_port}:8080
+ - ${_param:gerrit_ssh_publish_port}:29418
volumes:
- /srv/volumes/gerrit:/var/gerrit/review_site
depends_on:
@@ -62,6 +65,6 @@
condition: any
image: "${_param:docker_image_mysql}"
ports:
- - 13306:3306
+ - ${_param:gerrit_db_publish_port}:3306
volumes:
- /srv/volumes/mysql:/var/lib/mysql
diff --git a/keystone/client/single.yml b/keystone/client/single.yml
index b8ab7f1..74d3e5b 100644
--- a/keystone/client/single.yml
+++ b/keystone/client/single.yml
@@ -2,6 +2,7 @@
- system.keystone.client.os_client_config.admin_identity
- system.keystone.client.service.cinder
- system.keystone.client.service.cinder2
+- system.keystone.client.service.cinder3
- system.keystone.client.service.glance
- system.keystone.client.service.heat
- system.keystone.client.service.heat-cfn