summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-08-31 00:24:53 +0000
committerGerrit Code Review <review@openstack.org>2017-08-31 00:24:53 +0000
commite7c822b6e3b3d3747930c101f16e7bdd96c98e2f (patch)
tree75c23826e04a56f0c3e642c7496fb991018d23a2
parent5f91a4bbe146d65e95a7d072d168aab399c69135 (diff)
parent3ebb05d9877e1961e5df53e05eae4f2b7a96a836 (diff)
Merge "Add DockerPuppetProcessCount defaults to 3" into stable/pike
-rw-r--r--common/deploy-steps-tasks.yaml1
-rw-r--r--common/deploy-steps.j26
2 files changed, 7 insertions, 0 deletions
diff --git a/common/deploy-steps-tasks.yaml b/common/deploy-steps-tasks.yaml
index 998bbe0c..f0729425 100644
--- a/common/deploy-steps-tasks.yaml
+++ b/common/deploy-steps-tasks.yaml
@@ -28,6 +28,7 @@
environment:
NET_HOST: 'true'
DEBUG: '{{docker_puppet_debug|default(false)}}'
+ PROCESS_COUNT: '{{docker_puppet_process_count|default(3)}}'
when: step == "1"
changed_when: false
check_mode: no
diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index db2b21c1..32d1afcf 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -44,6 +44,10 @@ parameters:
type: string
default: ''
description: Set to True to enable debug logging with docker-puppet.py
+ DockerPuppetProcessCount:
+ type: number
+ default: 3
+ description: Number of concurrent processes to use when running docker-puppet to generate config files.
ctlplane_service_ips:
type: json
@@ -74,6 +78,7 @@ resources:
- name: update_identifier
- name: bootstrap_server_id
- name: docker_puppet_debug
+ - name: docker_puppet_process_count
config:
str_replace:
template: |
@@ -273,6 +278,7 @@ resources:
update_identifier: {get_param: DeployIdentifier}
bootstrap_server_id: {get_param: [servers, {{primary_role_name}}, '0']}
docker_puppet_debug: {get_param: DockerPuppetDebug}
+ docker_puppet_process_count: {get_param: DockerPuppetProcessCount}
{% endfor %}
# END CONFIG STEPS