Skip to content

Commit

Permalink
Merge pull request #4858 from jarrpa/unsupported-params
Browse files Browse the repository at this point in the history
Remove unsupported parameters from example inventory files.
  • Loading branch information
sdodson authored Jul 25, 2017
2 parents 3131ec2 + 634dc18 commit 9208ea9
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 28 deletions.
10 changes: 5 additions & 5 deletions inventory/byo/hosts.byo.glusterfs.external.example
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ openshift_storage_glusterfs_is_native=False
openshift_storage_glusterfs_heketi_url=172.0.0.1

[masters]
master node=True storage=True master=True
master

[nodes]
master node=True storage=True master=True openshift_schedulable=False
node0 node=True openshift_schedulable=True
node1 node=True openshift_schedulable=True
node2 node=True openshift_schedulable=True
master openshift_schedulable=False
node0 openshift_schedulable=True
node1 openshift_schedulable=True
node2 openshift_schedulable=True

# Specify the glusterfs group, which contains the nodes of the external
# GlusterFS cluster. At a minimum, each node must have "glusterfs_hostname"
Expand Down
10 changes: 5 additions & 5 deletions inventory/byo/hosts.byo.glusterfs.mixed.example
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ openshift_storage_glusterfs_heketi_is_native=True
openshift_storage_glusterfs_heketi_executor=ssh
openshift_storage_glusterfs_heketi_ssh_keyfile=/root/id_rsa
[masters]
master node=True storage=True master=True
master

[nodes]
master node=True storage=True master=True openshift_schedulable=False
node0 node=True openshift_schedulable=True
node1 node=True openshift_schedulable=True
node2 node=True openshift_schedulable=True
master openshift_schedulable=False
node0 openshift_schedulable=True
node1 openshift_schedulable=True
node2 openshift_schedulable=True

# Specify the glusterfs group, which contains the nodes of the external
# GlusterFS cluster. At a minimum, each node must have "glusterfs_hostname"
Expand Down
10 changes: 5 additions & 5 deletions inventory/byo/hosts.byo.glusterfs.native.example
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ ansible_ssh_user=root
openshift_deployment_type=origin

[masters]
master node=True storage=True master=True
master

[nodes]
master node=True storage=True master=True openshift_schedulable=False
master openshift_schedulable=False
# A hosted registry, by default, will only be deployed on nodes labeled
# "region=infra".
node0 node=True openshift_schedulable=True
node1 node=True openshift_schedulable=True
node2 node=True openshift_schedulable=True
node0 openshift_schedulable=True
node1 openshift_schedulable=True
node2 openshift_schedulable=True

# Specify the glusterfs group, which contains the nodes that will host
# GlusterFS storage pods. At a minimum, each node must have a
Expand Down
10 changes: 5 additions & 5 deletions inventory/byo/hosts.byo.glusterfs.registry-only.example
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ openshift_deployment_type=origin
openshift_hosted_registry_storage_kind=glusterfs

[masters]
master node=True storage=True master=True
master

[nodes]
master node=True storage=True master=True openshift_schedulable=False
master openshift_schedulable=False
# A hosted registry, by default, will only be deployed on nodes labeled
# "region=infra".
node0 node=True openshift_node_labels="{'region': 'infra'}" openshift_schedulable=True
node1 node=True openshift_node_labels="{'region': 'infra'}" openshift_schedulable=True
node2 node=True openshift_node_labels="{'region': 'infra'}" openshift_schedulable=True
node0 openshift_node_labels="{'region': 'infra'}" openshift_schedulable=True
node1 openshift_node_labels="{'region': 'infra'}" openshift_schedulable=True
node2 openshift_node_labels="{'region': 'infra'}" openshift_schedulable=True

# Specify the glusterfs group, which contains the nodes that will host
# GlusterFS storage pods. At a minimum, each node must have a
Expand Down
16 changes: 8 additions & 8 deletions inventory/byo/hosts.byo.glusterfs.storage-and-registry.example
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,20 @@ openshift_deployment_type=origin
openshift_hosted_registry_storage_kind=glusterfs

[masters]
master node=True storage=True master=True
master

[nodes]
master node=True storage=True master=True openshift_schedulable=False
master openshift_schedulable=False
# It is recommended to not use a single cluster for both general and registry
# storage, so two three-node clusters will be required.
node0 node=True openshift_schedulable=True
node1 node=True openshift_schedulable=True
node2 node=True openshift_schedulable=True
node0 openshift_schedulable=True
node1 openshift_schedulable=True
node2 openshift_schedulable=True
# A hosted registry, by default, will only be deployed on nodes labeled
# "region=infra".
node3 node=True openshift_node_labels="{'region': 'infra'}" openshift_schedulable=True
node4 node=True openshift_node_labels="{'region': 'infra'}" openshift_schedulable=True
node5 node=True openshift_node_labels="{'region': 'infra'}" openshift_schedulable=True
node3 openshift_node_labels="{'region': 'infra'}" openshift_schedulable=True
node4 openshift_node_labels="{'region': 'infra'}" openshift_schedulable=True
node5 openshift_node_labels="{'region': 'infra'}" openshift_schedulable=True

# Specify the glusterfs group, which contains the nodes that will host
# GlusterFS storage pods. At a minimum, each node must have a
Expand Down

0 comments on commit 9208ea9

Please sign in to comment.