summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-23 08:57:32 +0000
committerGerrit Code Review <review@openstack.org>2017-03-23 08:57:32 +0000
commitccdab4a8d5451f74d28176b43852b7afcc8fec20 (patch)
tree9fbe18d2405434f658bb15fdc2ca4f13917080b3
parent27137a5dbd50210781edaf9a0a5d1fc56d64fc0e (diff)
parent22d5c26b3b48fd051c553b0d2b55b9d28d96e0d1 (diff)
Merge "Execute ssl-dns-setup task on all pre-defined tags"
-rw-r--r--deployment/puppet/osnailyfacter/modular/ssl/tasks.yaml4
1 files changed, 3 insertions, 1 deletions
diff --git a/deployment/puppet/osnailyfacter/modular/ssl/tasks.yaml b/deployment/puppet/osnailyfacter/modular/ssl/tasks.yaml
index f72875a..3970cb8 100644
--- a/deployment/puppet/osnailyfacter/modular/ssl/tasks.yaml
+++ b/deployment/puppet/osnailyfacter/modular/ssl/tasks.yaml
@@ -40,7 +40,9 @@
40- id: ssl-dns-setup 40- id: ssl-dns-setup
41 type: puppet 41 type: puppet
42 version: 2.1.0 42 version: 2.1.0
43 groups: [primary-controller, controller] 43 groups: [primary-controller, controller, compute, cinder, primary-mongo, mongo, ceph-osd, virt,
44 primary-rabbitmq, rabbitmq, primary-database, database,
45 primary-keystone, keystone, primary-neutron, neutron]
44 requires: [firewall, ssl-add-trust-chain] 46 requires: [firewall, ssl-add-trust-chain]
45 condition: 47 condition:
46 yaql_exp: *public_ssl_enabled 48 yaql_exp: *public_ssl_enabled