diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-12-10 11:21:16 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-12-10 11:21:16 -0500 |
| commit | b10f66a2786161c79e68ba8f7e6f9b3a2caab76c (patch) | |
| tree | 7e8d782d73cad3875edba603ed19c5e8ba5f6f44 /roles | |
| parent | 493dba34b5100301366c550596be50e0b7d5a681 (diff) | |
| parent | 9fc1e7ac3e066add840be7691a9647f6157afe27 (diff) | |
| download | openshift-b10f66a2786161c79e68ba8f7e6f9b3a2caab76c.tar.gz openshift-b10f66a2786161c79e68ba8f7e6f9b3a2caab76c.tar.bz2 openshift-b10f66a2786161c79e68ba8f7e6f9b3a2caab76c.tar.xz openshift-b10f66a2786161c79e68ba8f7e6f9b3a2caab76c.zip | |
Merge pull request #1030 from jtslear/make-examples-optional
Make the install of openshift_examples optional
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_common/tasks/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_examples/README.md | 9 | ||||
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 1 |
3 files changed, 10 insertions, 1 deletions
diff --git a/roles/openshift_common/tasks/main.yml b/roles/openshift_common/tasks/main.yml index c17cb12cd..c34f42838 100644 --- a/roles/openshift_common/tasks/main.yml +++ b/roles/openshift_common/tasks/main.yml @@ -14,6 +14,7 @@ cluster_id: "{{ openshift_cluster_id | default('default') }}" debug_level: "{{ openshift_debug_level | default(2) }}" hostname: "{{ openshift_hostname | default(None) }}" + install_examples: "{{ openshift_install_examples | default(True) }}" ip: "{{ openshift_ip | default(None) }}" public_hostname: "{{ openshift_public_hostname | default(None) }}" public_ip: "{{ openshift_public_ip | default(None) }}" diff --git a/roles/openshift_examples/README.md b/roles/openshift_examples/README.md index 7d8735a0a..6ddbe7017 100644 --- a/roles/openshift_examples/README.md +++ b/roles/openshift_examples/README.md @@ -11,6 +11,13 @@ ansible. Requirements ------------ +Facts +----- + +| Name | Default Value | Description | +-----------------------------|---------------|----------------------------------------| +| openshift_install_examples | true | Runs the role with the below variables | + Role Variables -------------- @@ -32,7 +39,7 @@ Example Playbook TODO ---- Currently we use `oc create -f` against various files and we accept non zero return code as a success -if (and only iff) stderr also contains the string 'already exists'. This means that if one object in the file exists already +if (and only if) stderr also contains the string 'already exists'. This means that if one object in the file exists already but others fail to create you won't be aware of the failure. This also means that we do not currently support updating existing objects. diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 8b3402729..e557853b1 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -1057,6 +1057,7 @@ class OpenShiftFacts(object): common['client_binary'] = 'oc' if os.path.isfile('/usr/bin/oc') else 'osc' common['admin_binary'] = 'oadm' if os.path.isfile('/usr/bin/oadm') else 'osadm' common['dns_domain'] = 'cluster.local' + common['install_examples'] = True defaults['common'] = common if 'master' in roles: |