summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-11-03 21:52:09 -0700
committerGitHub <noreply@github.com>2017-11-03 21:52:09 -0700
commit86643ad6e12d10803fdae5e103a7392795c35a8d (patch)
tree71562b1156b49e812c30f660cf140894267aec0a /playbooks/common
parent413fe019b488b75909629c68949ba693004afd6a (diff)
parent983fdade31c57654854cce3c5340e8bf5a7838e7 (diff)
downloadopenshift-86643ad6e12d10803fdae5e103a7392795c35a8d.tar.gz
openshift-86643ad6e12d10803fdae5e103a7392795c35a8d.tar.bz2
openshift-86643ad6e12d10803fdae5e103a7392795c35a8d.tar.xz
openshift-86643ad6e12d10803fdae5e103a7392795c35a8d.zip
Merge pull request #6006 from mgugino-upstream-stage/elb-v2
Automatic merge from submit-queue. Bootstrap enhancements. This includes the elb work.
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-master/config.yml7
1 files changed, 7 insertions, 0 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index b359919ba..f32073f09 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -212,6 +212,13 @@
tasks_from: master
when: openshift_use_kuryr | default(false) | bool
+ - name: Setup the compute and infra node config maps
+ include_role:
+ name: openshift_node_bootstrap_configmap
+ tasks_from: standard.yml
+ when: openshift_master_bootstrap_enabled | default(false) | bool
+ run_once: True
+
post_tasks:
- name: Create group for deployment type
group_by: key=oo_masters_deployment_type_{{ openshift.common.deployment_type }}