summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge openshift_env hostvars.Andrew Butcher2016-04-083-10/+20
|
* Add openshift_hosted_facts role and remove hosted facts from openshift_common.Andrew Butcher2016-04-087-11/+33
|
* Merge pull request #1728 from brenton/bz1324729Brenton Leanhardt2016-04-082-8/+8
|\ | | | | Bug 1324729 - Import xPaas image streams failed during 3.2 installation
| * Bug 1324729 - Import xPaas image streams failed during 3.2 installationBrenton Leanhardt2016-04-072-8/+8
| |
* | Merge pull request #1720 from abutcher/fix-docker-installBrenton Leanhardt2016-04-071-2/+2
|\ \ | |/ |/| Test docker_version_result.stdout when determining if docker should be installed/downgraded.
| * Test docker_version_result.stdout when determining if docker should be ↵Andrew Butcher2016-04-061-2/+2
| | | | | | | | installed/downgraded.
* | Automatic commit of package [openshift-ansible] release [3.0.75-1].Troy Dawson2016-04-072-2/+9
| |
* | Merge pull request #1719 from kwoodson/oadmrouterKenny Woodson2016-04-0711-82/+1375
|\ \ | | | | | | oadm_router first attempt.
| * | First attempt at oadm router moduleKenny Woodson2016-04-0711-82/+1375
| | |
* | | Merge pull request #1724 from abutcher/nfs-no-commonBrenton Leanhardt2016-04-072-8/+7
|\ \ \ | | | | | | | | Bug 1324371: needn't install atomic-openshift packages on nfs server
| * | | Remove openshift_common dep from openshift_storage_nfsAndrew Butcher2016-04-062-8/+7
| | | |
* | | | Merge pull request #1722 from abutcher/containerized-cloudproviderBrenton Leanhardt2016-04-074-4/+4
|\ \ \ \ | | | | | | | | | | Add cloudprovider config dir to docker options.
| * | | | Add cloudprovider config dir to docker options.Andrew Butcher2016-04-064-4/+4
| | |_|/ | |/| |
* | | | Merge pull request #1699 from abutcher/check-cloudprovider-kindBrenton Leanhardt2016-04-065-22/+25
|\ \ \ \ | | | | | | | | | | Check for kind in cloudprovider facts prior to accessing.
| * | | | Check for kind in cloudprovider facts prior to accessing.Andrew Butcher2016-04-045-22/+25
| | | | |
* | | | | Automatic commit of package [openshift-ansible] release [3.0.74-1].Brenton Leanhardt2016-04-062-2/+6
| | | | |
* | | | | Merge pull request #1660 from dgoodwin/admission-configBrenton Leanhardt2016-04-063-4/+56
|\ \ \ \ \ | | | | | | | | | | | | Add support for templating master admissionConfig.
| * | | | | Add support for configuring oauth templates.Devan Goodwin2016-04-013-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow users who wish to deploy configs with ansible to define templates for oauth screens, and control the alwaysShowProviderSelection setting. There are currently three supported oauth templates, and we have a pre-existing 'oauth_template' variable, but it is assumed to mean you are controlling the 'login' screen, and this is the only one you can configure. To work around this, supporting all current and future templates, introduce a pluralized variable 'oauth_templates', which contains a JSON dict allowing the admin to control any template they wish. If both new and old variables are defined, the old one is ignored. (and can be considered deprecated) Internally the old value will be converted to the new dict, so the template just references one value. Example: openshift_master_oauth_always_show_provider_selection=true openshift_master_oauth_templates={"providerSelection": "provider-selection.html", "error": "oauth-error.html"} Yeilds: oauthConfig: alwaysShowProviderSelection: true templates: error: oauth-error.html providerSelection: provider-selection.html
| * | | | | Add support for templating master admissionConfig.Devan Goodwin2016-04-013-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds four new inventory variables for setting sections in "admissionConfig" and "kubernetesMasterConfig.admissionConfig". openshift_master_admission_plugin_order allows configuring the list of origin admission controller plugins to enable and what order to run them in. This must be a JSON formatted list of strings: openshift_master_admission_plugin_order=["RunOnceDuration", "NamespaceLifecycle", "OriginPodNodeEnvironment", "ClusterResourceOverride", "LimitRanger", "ServiceAccount", "SecurityContextConstraint", "ResourceQuota", "SCCExecRestrictions"] openshift_master_kube_admission_plugin_order is identical but for the kubernetes admission controller plugins which appear beneath kubernetesMasterConfig. openshift_master_admission_plugin_config allows setting free-form configuration stanzas that match up with enabled admission controller plugins. This must be a JSON formatted hash: openshift_master_admission_plugin_config={"RunOnceDuration":{"configuration":{"apiVersion":"v1","kind":"RunOnceDurationConfig","activeDeadlineSecondsOverride":3600}},"ClusterResourceOverride":{"configuration":{"apiVersion":"v1","kind":"ClusterResourceOverrideConfig","limitCPUToMemoryPercent":200,"cpuRequestToLimitPercent":6,"memoryRequestToLimitPercent":60}}} openshift_master_kube_admission_plugin_config is the equivalent for kubernetes admission controller plugins. Contains a change to merge_facts to fix issues with modifying inventory variables that contain JSON dicts. If you modified a previously set variable, the result would be a merge of old and new, which is completely wrong in this case. Addded new overwrite_facts to shortcut to just taking the new values. This differs from the pre-existing concept of "protected" in that we're not protecting an old value, we're trashing it and taking the new.
* | | | | | Automatic commit of package [openshift-ansible] release [3.0.73-1].Troy Dawson2016-04-062-2/+19
| | | | | |
* | | | | | Merge pull request #1723 from dgoodwin/osbs-dockerfileBrenton Leanhardt2016-04-061-10/+16
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Replace unused Dockerfile with one used for official builds.
| * | | | | Replace unused Dockerfile with one used for official builds.Devan Goodwin2016-04-061-10/+16
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A container that can be used to run the atomic-openshift-installer, or by bypassing the entrypoint can be used to run ansible playbooks directly. Expects the user to mount a directory to /var/lib/openshift, where we'll write out the installer.cfg, ansible.log, and hosts inventory. WARNING: Don't run this on a host you're installing to, installation restarts Docker which will kill your installer. Example of running the quick installer: docker run -ti -v ~/openshift/:/var/lib/openshift-installer/:Z -v ~/.ssh:/root/.ssh:Z openshift3/installer install Example of running ansible directly: docker run --entrypoint=/usr/bin/ansible-playbook -ti -v ~/openshift/:/var/lib/openshift-installer/:Z -v ~/.ssh:/root/.ssh:Z openshift3/installer -i /openshift-installer/install/.ansible/hosts /usr/share/ansible/openshift-ansible/playbooks/adhoc/uninstall.yml
* | | | | Merge pull request #1721 from kwoodson/userrefreshKenny Woodson2016-04-061-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Adding refresh for zbx_user.
| * | | | | Update for zbx_user refreshKenny Woodson2016-04-061-0/+2
| | | | | |
* | | | | | Merge pull request #1717 from sdodson/origin-docker-funtimesBrenton Leanhardt2016-04-061-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Docker 1.9 is actually cool starting in origin 1.1.4
| * | | | | | Docker 1.9 is actually cool starting in origin 1.1.4Scott Dodson2016-04-061-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #1716 from brenton/unmask1Brenton Leanhardt2016-04-061-0/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Unmask services
| * | | | | Unmask servicesBrenton Leanhardt2016-04-061-0/+8
|/ / / / / | | | | | | | | | | | | | | | | | | | | Unmasking etcd is is important when switching from containerized installs to RPM installs
* | | | | Merge pull request #1695 from brenton/bz1323123Brenton Leanhardt2016-04-0610-7/+8
|\ \ \ \ \ | | | | | | | | | | | | Fixing bugs 1322788 and 1323123
| * | | | | Bug 1322788 - The IMAGE_VERSION wasn't added to atomic-openshift-master-api ↵Brenton Leanhardt2016-04-0110-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | and atomic-openshift-master-controllers
| * | | | | Bug 1323123 - upgrade failed to containerized OSE on RHEL Host without ↵Brenton Leanhardt2016-04-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | ose3.2 repo
* | | | | | Merge pull request #1698 from sdodson/xpaas13Brenton Leanhardt2016-04-06100-4502/+9996
|\ \ \ \ \ \ | | | | | | | | | | | | | | XPAAS v1.3 content
| * | | | | | XPAAS v1.3 for OSE 3.2Scott Dodson2016-04-0453-5218/+1805
| | | | | | |
| * | | | | | XPAAS 1.3 content for OSE 3.1Scott Dodson2016-04-0448-37/+8944
| |/ / / / /
* | | | | | Merge pull request #1654 from dgoodwin/gen-inventoryBrenton Leanhardt2016-04-055-49/+134
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add --gen-inventory command to atomic-openshift-installer.
| * | | | | | Write inventory to same directory as quick install config.Devan Goodwin2016-03-243-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the addition of a --gen-inventory flag and always displaying the location of the inventory written to disk, we should write the hosts file to a more prominent location rather than a hidden directory.
| * | | | | | Add --gen-inventory command to atomic-openshift-installer.Devan Goodwin2016-03-244-39/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will just generate the Ansible inventory once all information is gathered, inform the user where to find it, and exit. Includes some test utility updates to make what broke as a result of this change less fragile.
* | | | | | | Automatic commit of package [openshift-ansible] release [3.0.72-1].Troy Dawson2016-04-052-2/+9
| | | | | | |
* | | | | | | Merge pull request #1708 from mwoodson/docker-bugMatt Woodson2016-04-051-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | when docker is installed, make it 1.8.2 to avoid issues
| * | | | | | | when docker is installed, make it 1.8.2 to avoid issuesMatt Woodson2016-04-051-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #1700 from brenton/32haBrenton Leanhardt2016-04-052-0/+11
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Pacemaker is unsupported for 3.2
| * | | | | | Pacemaker is unsupported for 3.2Brenton Leanhardt2016-04-042-0/+11
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #1577 from brenton/docker19Brenton Leanhardt2016-04-051-2/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | We require docker 1.9 for the 3.2 upgrade
| * | | | | | We require docker 1.9 for the 3.2 upgradeBrenton Leanhardt2016-03-091-2/+1
| | | | | | |
* | | | | | | Merge pull request #1655 from sdodson/more-docker19Brenton Leanhardt2016-04-059-25/+43
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Downgrade to docker 1.8.2 if installing < 1.2/3.2
| * | | | | | Downgrade to docker 1.8.2 if installing OSE < 3.2Scott Dodson2016-04-059-25/+43
|/ / / / / /
* | | | | | Merge pull request #1704 from kwoodson/yeditfixMatt Woodson2016-04-048-37/+109
|\ \ \ \ \ \ | | | | | | | | | | | | | | yedit now handles periods in key names
| * | | | | | Fixing regexp. Periods are no longer allowedKenny Woodson2016-04-048-37/+109
| | | | | | |
* | | | | | | Automatic commit of package [openshift-ansible] release [3.0.71-1].Troy Dawson2016-04-042-2/+7
|/ / / / / /
* | | | | | Merge pull request #1702 from joelddiaz/heartbeat-severityJoel Diaz2016-04-041-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | add higher severity trigger if no heartbeat for 1 hour
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 22:58:16 +0000