summaryrefslogtreecommitdiffstats
path: root/.papr.inventory
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-02-02 04:59:16 -0800
committerGitHub <noreply@github.com>2018-02-02 04:59:16 -0800
commit22462aa17098116660d4600c9a1e87cd3ad40698 (patch)
treea1f848e11070e1fee1f638b34f952e6060d670c4 /.papr.inventory
parent55b91ccaa38d759829327589fbaa27ad12d7fd26 (diff)
parent6093e718a91879c140fa6a6967a345456f583144 (diff)
downloadopenshift-22462aa17098116660d4600c9a1e87cd3ad40698.tar.gz
openshift-22462aa17098116660d4600c9a1e87cd3ad40698.tar.bz2
openshift-22462aa17098116660d4600c9a1e87cd3ad40698.tar.xz
openshift-22462aa17098116660d4600c9a1e87cd3ad40698.zip
Merge pull request #6949 from vrutkovs/schedulable-masters
Automatic merge from submit-queue. Make masters schedulable by default Fixes #6930
Diffstat (limited to '.papr.inventory')
-rw-r--r--.papr.inventory2
1 files changed, 1 insertions, 1 deletions
diff --git a/.papr.inventory b/.papr.inventory
index c678e76aa..80ad81efa 100644
--- a/.papr.inventory
+++ b/.papr.inventory
@@ -22,6 +22,6 @@ ocp-master
ocp-master
[nodes]
-ocp-master openshift_schedulable=false
+ocp-master openshift_schedulable=true
ocp-node1 openshift_node_labels="{'region':'infra'}"
ocp-node2 openshift_node_labels="{'region':'infra'}"