diff options
| author | Wesley Hearn <wesley.s.hearn@gmail.com> | 2015-08-28 14:00:23 -0400 |
|---|---|---|
| committer | Wesley Hearn <wesley.s.hearn@gmail.com> | 2015-08-28 14:00:23 -0400 |
| commit | 8dd04af47c574a0e4c98f5cab55283be04fa1683 (patch) | |
| tree | 7fa25006f802a36feb8db5af2a2f7b60abba42ca /inventory | |
| parent | 68223f205b6c4e6ea124ccc982cd9bbcba63ced6 (diff) | |
| parent | 1b3fff6248fbd6788a26ee2b6c60f7731891c0f4 (diff) | |
| download | openshift-8dd04af47c574a0e4c98f5cab55283be04fa1683.tar.gz openshift-8dd04af47c574a0e4c98f5cab55283be04fa1683.tar.bz2 openshift-8dd04af47c574a0e4c98f5cab55283be04fa1683.tar.xz openshift-8dd04af47c574a0e4c98f5cab55283be04fa1683.zip | |
Merge pull request #512 from sdodson/next
Merge in Atomic Enterprise work into master
Diffstat (limited to 'inventory')
| -rw-r--r-- | inventory/byo/hosts.example | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/inventory/byo/hosts.example b/inventory/byo/hosts.example index 2bbc4ca1e..300fd7ac3 100644 --- a/inventory/byo/hosts.example +++ b/inventory/byo/hosts.example @@ -18,7 +18,7 @@ ansible_ssh_user=root #ansible_sudo=true # deployment type valid values are origin, online and enterprise -deployment_type=enterprise +deployment_type=atomic-enterprise # Enable cluster metrics #use_cluster_metrics=true @@ -55,7 +55,7 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # For installation the value of openshift_master_cluster_hostname must resolve # to the first master defined in the inventory. # The HA solution must be manually configured after installation and must ensure -# that openshift-master is running on a single master host. +# that the master is running on a single master host. #openshift_master_cluster_hostname=openshift-ansible.test.example.com #openshift_master_cluster_public_hostname=openshift-ansible.test.example.com #openshift_master_cluster_defer_ha=True @@ -64,7 +64,7 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', #osm_default_subdomain=apps.test.example.com # additional cors origins -#osm_custom_cors_origins=['foo.example.com', 'bar.example.com'] +#osm_custom_cors_origins=['foo.example.com', 'bar.example.com'] # default project node selector #osm_default_node_selector='region=primary' |