summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1744 from smunilla/BZ1323918Brenton Leanhardt2016-04-121-1/+1
|\ | | | | Convert image_tag on masters
| * Convert image_tag on mastersSamuel Munilla2016-04-121-1/+1
| | | | | | | | Also convert openshift_image_tag to and rpm versions for masters.
* | Merge pull request #1718 from brenton/docker1Brenton Leanhardt2016-04-1217-67/+93
|\ \ | | | | | | Containerized installs on RHEL were downgrading docker unnecessarily
| * | Bug 1324728 - Ansible should not downgrade docker when installing 3.2 ↵Brenton Leanhardt2016-04-122-8/+25
| | | | | | | | | | | | containerized env
| * | Fixing non-HA master restart conditionalBrenton Leanhardt2016-04-121-1/+1
| | |
| * | Fetching the current version a little more carefullyBrenton Leanhardt2016-04-122-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | Previously we were trying to use the running container to get the current version. There are cases in which the Master or Node may not be running during upgrade. It's actually safer to just run the container to fetch the version that would be launch if the container were running. Then we pull the image to see what the latest image contains.
| * | Make sure Docker is restarted after we have correctly configured the ↵Brenton Leanhardt2016-04-121-1/+5
| | | | | | | | | | | | containerized systemd units
| * | use RestartSec to avoid default rate limit in systemdBrenton Leanhardt2016-04-128-0/+8
| | | | | | | | | | | | Lifted from https://github.com/openshift/origin/pull/8317
| * | Installs and upgrades from authenticated registries are not supported for nowBrenton Leanhardt2016-04-121-31/+0
| | |
| * | Handle cases where the pacemaker variables aren't setBrenton Leanhardt2016-04-121-1/+1
| | |
| * | Containerized installs on RHEL were downgrading docker unnecessarilyBrenton Leanhardt2016-04-127-34/+58
| |/
* / Automatic commit of package [openshift-ansible] release [3.0.78-1].Troy Dawson2016-04-122-2/+5
|/
* Merge pull request #1705 from abutcher/secure-routerBrenton Leanhardt2016-04-1217-131/+411
|\ | | | | Add support for creating secure router
| * Add support for creating secure router.Andrew Butcher2016-04-1117-131/+411
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Move openshift_router to openshift_hosted role which will eventually contain registry, metrics and logging. * Adds option for specifying an openshift_hosted_router_certificate cert and key pair. * Removes dependency on node label variables and retrieves the node list from the API s.t. this role can be applied to any cluster with existing nodes. I've added an openshift_hosted playbook that occurs after node install to account for this. * Infrastructure nodes are selected using openshift_hosted_router_selector which is based on deployment type by default; openshift-enterprise -> "region=infra" and online -> "type=infra".
* | Automatic commit of package [openshift-ansible] release [3.0.77-1].Troy Dawson2016-04-112-2/+10
| |
* | Merge pull request #1740 from dgoodwin/docker-sysconfigBrenton Leanhardt2016-04-111-4/+3
|\ \ | |/ |/| Fix a docker-storage sysconfig bug.
| * Fix a docker-storage sysconfig bug.Devan Goodwin2016-04-111-4/+3
|/
* Merge pull request #1736 from maxamillion/bootstrap-fedoraBrenton Leanhardt2016-04-081-1/+1
|\ | | | | update bootstrap-fedora to include python2-firewall for F24+
| * update bootstrap-fedora to include python2-firewall for F24+Adam Miller2016-04-081-1/+1
|/ | | | Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>
* Merge pull request #1733 from abutcher/hosted-factsBrenton Leanhardt2016-04-089-16/+48
|\ | | | | Fix hosted facts
| * 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
| |
* | Automatic commit of package [openshift-ansible] release [3.0.76-1].Troy Dawson2016-04-082-2/+9
| |
* | Merge pull request #1735 from smunilla/BZ1323918Brenton Leanhardt2016-04-081-1/+3
|\ \ | |/ |/| a-o-i: Support openshift_image_tag
| * a-o-i: Support openshift_image_tagSamuel Munilla2016-04-081-1/+3
| | | | | | | | | | | | Somewhat hacky solution to let users install containerized 3.1. A more flexible version will be forthcoming once we settle tagging issues.
* | 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