diff options
| author | Troy Dawson <tdawson@redhat.com> | 2015-04-16 16:19:02 -0500 |
|---|---|---|
| committer | Troy Dawson <tdawson@redhat.com> | 2015-04-16 16:19:02 -0500 |
| commit | 7f7b582a7bc239e69c147b98c8c2512050f12851 (patch) | |
| tree | f0701e3ce7a42761e9dfb59218057a46e48a901b /roles/openshift_master/README.md | |
| parent | db9cf8ef4f030f30391e021f360fe0c3db1dce74 (diff) | |
| parent | 0722304b2f9c94a2f70054e0a3c7feceaedb195c (diff) | |
| download | openshift-7f7b582a7bc239e69c147b98c8c2512050f12851.tar.gz openshift-7f7b582a7bc239e69c147b98c8c2512050f12851.tar.bz2 openshift-7f7b582a7bc239e69c147b98c8c2512050f12851.tar.xz openshift-7f7b582a7bc239e69c147b98c8c2512050f12851.zip | |
Merge pull request #158 from openshift/master
Merge master into INT for first v3 INT deploy
Diffstat (limited to 'roles/openshift_master/README.md')
| -rw-r--r-- | roles/openshift_master/README.md | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/roles/openshift_master/README.md b/roles/openshift_master/README.md index 5a1b889b2..9f9d0a613 100644 --- a/roles/openshift_master/README.md +++ b/roles/openshift_master/README.md @@ -13,21 +13,24 @@ Role Variables -------------- From this role: -| Name | Default value | -| -|------------------------------------------|-----------------------|----------------------------------------| -| openshift_master_manage_service_externally | False | Should the openshift-master role manage the openshift-master service? | -| openshift_master_debug_level | openshift_debug_level | Verbosity of the debug logs for openshift-master | -| openshift_node_ips | [] | List of the openshift node ip addresses, that we want to pre-register to the system when openshift-master starts up | -| openshift_registry_url | UNDEF (Optional) | Default docker registry to use | +| Name | Default value | | +|-------------------------------------|-----------------------|--------------------------------------------------| +| openshift_master_debug_level | openshift_debug_level | Verbosity of the debug logs for openshift-master | +| openshift_node_ips | [] | List of the openshift node ip addresses to pre-register when openshift-master starts up | +| openshift_registry_url | UNDEF | Default docker registry to use | +| openshift_master_api_port | UNDEF | | +| openshift_master_console_port | UNDEF | | +| openshift_master_api_url | UNDEF | | +| openshift_master_console_url | UNDEF | | +| openshift_master_public_api_url | UNDEF | | +| openshift_master_public_console_url | UNDEF | | From openshift_common: -| Name | Default Value | | -|-------------------------------|---------------------|---------------------| -| openshift_debug_level | 0 | Global openshift debug log verbosity | -| openshift_hostname_workaround | True | | -| openshift_public_ip | UNDEF (Required) | Public IP address to use for this host | -| openshift_hostname | openshift_public_ip if openshift_hostname_workaround else ansible_fqdn | hostname to use for this instance | +| Name | Default Value | | +|-------------------------------|----------------|----------------------------------------| +| openshift_debug_level | 0 | Global openshift debug log verbosity | +| openshift_public_ip | UNDEF | Public IP address to use for this host | +| openshift_hostname | UNDEF | hostname to use for this instance | Dependencies ------------ |