diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-06-22 02:12:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-22 02:12:46 -0400 |
| commit | 7db01fed21421ca9dbdcb1219b6da578db8bb96c (patch) | |
| tree | 6f9c96e1121f5caedd3d1d7b986001e28575f3c4 /inventory | |
| parent | 84012fbbe8ad4b71c717803cd72178f8faecef1d (diff) | |
| parent | 7b829ec9c332577003af727210a6f34cf27eea83 (diff) | |
| download | openshift-7db01fed21421ca9dbdcb1219b6da578db8bb96c.tar.gz openshift-7db01fed21421ca9dbdcb1219b6da578db8bb96c.tar.bz2 openshift-7db01fed21421ca9dbdcb1219b6da578db8bb96c.tar.xz openshift-7db01fed21421ca9dbdcb1219b6da578db8bb96c.zip | |
Merge pull request #4510 from ashcrow/system-container-inventory
Merged by openshift-bot
Diffstat (limited to 'inventory')
| -rw-r--r-- | inventory/byo/hosts.origin.example | 11 | ||||
| -rw-r--r-- | inventory/byo/hosts.ose.example | 11 |
2 files changed, 22 insertions, 0 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index 324271d00..d90edd37d 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -42,6 +42,17 @@ openshift_release=v3.6 # This could potentially trigger an upgrade and downtime, so be careful with modifying this value after the cluster is set up. #openshift_pkg_version=-3.6.0 +# This enables all the system containers except for docker: +#openshift_use_system_containers=False +# +# But you can choose separately each component that must be a +# system container: +# +#openshift_use_openvswitch_system_container=False +#openshift_use_node_system_container=False +#openshift_use_master_system_container=False +#openshift_use_etcd_system_container=False + # Install the openshift examples #openshift_install_examples=true diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index 2c3f011e2..130719195 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -42,6 +42,17 @@ openshift_release=v3.6 # This could potentially trigger an upgrade and downtime, so be careful with modifying this value after the cluster is set up. #openshift_pkg_version=-3.6.0 +# This enables all the system containers except for docker: +#openshift_use_system_containers=False +# +# But you can choose separately each component that must be a +# system container: +# +#openshift_use_openvswitch_system_container=False +#openshift_use_node_system_container=False +#openshift_use_master_system_container=False +#openshift_use_etcd_system_container=False + # Install the openshift examples #openshift_install_examples=true |