diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-02-02 04:59:16 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-02 04:59:16 -0800 |
| commit | 22462aa17098116660d4600c9a1e87cd3ad40698 (patch) | |
| tree | a1f848e11070e1fee1f638b34f952e6060d670c4 /inventory | |
| parent | 55b91ccaa38d759829327589fbaa27ad12d7fd26 (diff) | |
| parent | 6093e718a91879c140fa6a6967a345456f583144 (diff) | |
| download | openshift-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 'inventory')
| -rw-r--r-- | inventory/hosts.example | 5 | ||||
| -rw-r--r-- | inventory/hosts.glusterfs.external.example | 3 | ||||
| -rw-r--r-- | inventory/hosts.glusterfs.mixed.example | 3 | ||||
| -rw-r--r-- | inventory/hosts.glusterfs.native.example | 3 | ||||
| -rw-r--r-- | inventory/hosts.glusterfs.registry-only.example | 3 | ||||
| -rw-r--r-- | inventory/hosts.glusterfs.storage-and-registry.example | 3 |
6 files changed, 12 insertions, 8 deletions
diff --git a/inventory/hosts.example b/inventory/hosts.example index 18e094812..82c588100 100644 --- a/inventory/hosts.example +++ b/inventory/hosts.example @@ -1117,10 +1117,9 @@ ose3-etcd[1:3]-ansible.test.example.com ose3-lb-ansible.test.example.com containerized=false # NOTE: Currently we require that masters be part of the SDN which requires that they also be nodes -# However, in order to ensure that your masters are not burdened with running pods you should -# make them unschedulable by adding openshift_schedulable=False any node that's also a master. [nodes] -ose3-master[1:3]-ansible.test.example.com +# masters should be schedulable to run web console pods +ose3-master[1:3]-ansible.test.example.com openshift_schedulable=True ose3-node[1:2]-ansible.test.example.com openshift_node_labels="{'region': 'primary', 'zone': 'default'}" [nfs] diff --git a/inventory/hosts.glusterfs.external.example b/inventory/hosts.glusterfs.external.example index bf2557cf0..e718e3280 100644 --- a/inventory/hosts.glusterfs.external.example +++ b/inventory/hosts.glusterfs.external.example @@ -35,7 +35,8 @@ openshift_storage_glusterfs_heketi_url=172.0.0.1 master [nodes] -master openshift_schedulable=False +# masters should be schedulable to run web console pods +master openshift_schedulable=True node0 openshift_schedulable=True node1 openshift_schedulable=True node2 openshift_schedulable=True diff --git a/inventory/hosts.glusterfs.mixed.example b/inventory/hosts.glusterfs.mixed.example index 8a20a037e..b2fc00c58 100644 --- a/inventory/hosts.glusterfs.mixed.example +++ b/inventory/hosts.glusterfs.mixed.example @@ -38,7 +38,8 @@ openshift_storage_glusterfs_heketi_ssh_keyfile=/root/id_rsa master [nodes] -master openshift_schedulable=False +# masters should be schedulable to run web console pods +master openshift_schedulable=True node0 openshift_schedulable=True node1 openshift_schedulable=True node2 openshift_schedulable=True diff --git a/inventory/hosts.glusterfs.native.example b/inventory/hosts.glusterfs.native.example index 59acf1194..e5f2453ff 100644 --- a/inventory/hosts.glusterfs.native.example +++ b/inventory/hosts.glusterfs.native.example @@ -28,7 +28,8 @@ openshift_deployment_type=origin master [nodes] -master openshift_schedulable=False +# masters should be schedulable to run web console pods +master openshift_schedulable=True # A hosted registry, by default, will only be deployed on nodes labeled # "region=infra". node0 openshift_schedulable=True diff --git a/inventory/hosts.glusterfs.registry-only.example b/inventory/hosts.glusterfs.registry-only.example index 6f33e9f6d..dadb2c93e 100644 --- a/inventory/hosts.glusterfs.registry-only.example +++ b/inventory/hosts.glusterfs.registry-only.example @@ -34,7 +34,8 @@ openshift_hosted_registry_storage_kind=glusterfs master [nodes] -master openshift_schedulable=False +# masters should be schedulable to run web console pods +master openshift_schedulable=True # A hosted registry, by default, will only be deployed on nodes labeled # "region=infra". node0 openshift_node_labels="{'region': 'infra'}" openshift_schedulable=True diff --git a/inventory/hosts.glusterfs.storage-and-registry.example b/inventory/hosts.glusterfs.storage-and-registry.example index 1f3a4282a..184cb600b 100644 --- a/inventory/hosts.glusterfs.storage-and-registry.example +++ b/inventory/hosts.glusterfs.storage-and-registry.example @@ -35,7 +35,8 @@ openshift_hosted_registry_storage_kind=glusterfs master [nodes] -master openshift_schedulable=False +# masters should be schedulable to run web console pods +master openshift_schedulable=True # It is recommended to not use a single cluster for both general and registry # storage, so two three-node clusters will be required. node0 openshift_schedulable=True |