summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1550 from detiber/docker_refactorBrenton Leanhardt2016-03-1436-176/+309
|\ | | | | Docker role refactor
| * improve ordering of systemd unitsJason DeTiberus2016-03-1411-23/+34
| |
| * Docker role refactorJason DeTiberus2016-03-1425-153/+275
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - refactors the docker role to push generic config into docker role and wrap openshift specific variables into an openshift_docker role and it's dependent openshift_docker_facts role - adds support for setting --confirm-def-push flag (Resolves https://github.com/openshift/openshift-ansible/issues/1014) - moves docker related facts from common/node roles to a new docker role - renames cli_docker_* role varialbes to openshift_docker-* (maintaining backward compatibility) - update role dependencies to pull in openshift_docker conditionally based on is_containerized - remove playbooks/common/openshift-docker since the docker role is now conditionally included
* | Merge pull request #1451 from sdodson/is-syncBrenton Leanhardt2016-03-1441-683/+1764
|\ \ | |/ |/| Sync with latest image stream and templates
| * Sync latest to v1.2Scott Dodson2016-03-1418-363/+484
| |
| * Sync with latest image stream and templatesScott Dodson2016-03-1422-319/+1279
| |
| * Allow origin version to be passed in as an argumentScott Dodson2016-03-141-1/+1
| | | | | | | | so we can continue syncing v1.1 content
* | Merge pull request #1596 from abutcher/containerized-boolsBrenton Leanhardt2016-03-147-11/+20
|\ \ | |/ |/| Ensure is_containerized is cast as bool in templates and facts.
| * Ensure is_containerized is cast as bool.Andrew Butcher2016-03-147-8/+8
| |
| * openshift_facts: Safe cast additional boolsSamuel Munilla2016-03-101-1/+1
| |
| * openshift-ansible: Wrap boolean factsSamuel Munilla2016-03-101-2/+11
| | | | | | | | | | Centralize the very weird process for converting strings to booleans to help keep the code consistent.
* | Merge pull request #1578 from detiber/libvirt_fixesBrenton Leanhardt2016-03-146-9/+34
|\ \ | | | | | | Libvirt provider fixes
| * | Libvirt provider fixesJason DeTiberus2016-03-106-9/+34
| | | | | | | | | | | | | | | | | | - Use difference filter instead of reject/equalto - add ability to override vcpu and memory config for vms - add a dedicated drive for docker storage
* | | Merge pull request #1579 from abhat/add_plugin_logBrenton Leanhardt2016-03-144-0/+9
|\ \ \ | |_|/ |/| | Support log level configuration for Nuage exec plugin via ansible installer
| * | Expose log level on the monitorAniket Bhat2016-03-112-0/+5
| | |
| * | Support log level configuration for pluginAniket Bhat2016-03-092-0/+4
| | |
* | | Merge pull request #1583 from twiest/prThomas Wiest2016-03-101-1/+1
|\ \ \ | |/ / |/| | fixed copr releasers file
| * | fixed copr releasers fileThomas Wiest2016-03-101-1/+1
|/ /
* | Automatic commit of package [openshift-ansible] release [3.0.55-1].Brenton Leanhardt2016-03-092-2/+13
| |
* | Merge pull request #1182 from vnugent/masterBrenton Leanhardt2016-03-096-0/+240
|\ \ | | | | | | Playbook for enabling origin-metrics
| * | Formatting errorViet Nguyen2016-01-131-1/+1
| | |
| * | Introduce origin-metrics playbookViet Nguyen2016-01-136-0/+240
| | |
* | | Merge pull request #1576 from brenton/bz1315564Brenton Leanhardt2016-03-093-21/+24
|\ \ \ | |_|/ |/| | Bug 1315564 - upgrade to ose3.2 failed on Atomic Hosts
| * | Bug 1315564 - upgrade to ose3.2 failed on Atomic HostsBrenton Leanhardt2016-03-092-20/+23
| | |
| * | Bug 1315563 - Upgrade failed to containerized install OSE 3.1 on RHELBrenton Leanhardt2016-03-091-1/+1
| | | | | | | | | | | | | | | | | | Previously I was greping for 'ose' in the systemd units. That was only working on my machine because my Nodes were also Masters. It's safer to grep for openshift3 since that would be present for Masters or Nodes.
* | | Merge pull request #1009 from smunilla/nfs_questionBrenton Leanhardt2016-03-095-28/+130
|\ \ \ | |/ / |/| | Questions for NFS Storage Registry
| * | a-o-i: Fix NFS storage testsSamuel Munilla2016-03-094-20/+65
| | | | | | | | | | | | Fix the nosetests after the rebase
| * | First attempt at NFS setupSamuel Munilla2016-03-093-8/+65
|/ /
* | Merge pull request #1569 from brenton/masterBrenton Leanhardt2016-03-086-12/+22
|\ \ | | | | | | reverting back to pre-pulling the master image
| * \ Merge branch 'wait-all-the-time' of ↵Brenton Leanhardt2016-03-085-10/+10
| |\ \ | | | | | | | | | | | | https://github.com/abutcher/openshift-ansible
| | * | Use /healthz/ready when verifying apiAndrew Butcher2016-03-085-10/+10
| | | |
| * | | reverting back to pre-pulling the master imageBrenton Leanhardt2016-03-083-2/+12
| | | |
* | | | Automatic commit of package [openshift-ansible] release [3.0.54-1].Brenton Leanhardt2016-03-082-2/+11
| | | |
* | | | Merge pull request #1568 from brenton/bz1315563Brenton Leanhardt2016-03-081-3/+3
|\ \ \ \ | |/ / / |/| | | Bug 1315563 - stdout IO redirection wasn't working as expected over S…
| * | | Bug 1315563 - stdout IO redirection wasn't working as expected over SSH ↵Brenton Leanhardt2016-03-081-3/+3
|/ / / | | | | | | | | | | | | | | | connections Bug 1315563 - Upgrade failed to containerized install OSE 3.1 on RHEL
* | | Merge pull request #1567 from brenton/bz1315637Brenton Leanhardt2016-03-081-1/+1
|\ \ \ | | | | | | | | Bug 1315637 - The docker wasn't upgraded on node during upgrade
| * | | Bug 1315637 - The docker wasn't upgraded on node during upgradeBrenton Leanhardt2016-03-081-1/+1
| | | |
* | | | Merge pull request #1566 from brenton/bz1315564Brenton Leanhardt2016-03-082-0/+3
|\ \ \ \ | |/ / / |/| | | Bug 1315564 - upgrade to ose3.2 failed on Atomic Hosts
| * | | Bug 1315564 - upgrade to ose3.2 failed on Atomic HostsBrenton Leanhardt2016-03-082-0/+3
|/ / /
* | | Merge pull request #1565 from lhuard1A/fix_when_no_infraBrenton Leanhardt2016-03-084-4/+4
|\ \ \ | |/ / |/| | Fix issue when there are no infra nodes
| * | Fix issue when there are no infra nodesLénaïc Huard2016-03-084-4/+4
|/ / | | | | | | This issue was already addressed by #1355 fc2f776 but it has been accidentally reverted by 6d3e176.
* | Merge pull request #1562 from brenton/masterBrenton Leanhardt2016-03-081-1/+1
|\ \ | | | | | | Stop the etcd container during uninstall
| * | Stop the etcd container during uninstallBrenton Leanhardt2016-03-081-1/+1
|/ /
* | Automatic commit of package [openshift-ansible] release [3.0.53-1].Brenton Leanhardt2016-03-072-2/+8
| |
* | Merge pull request #1559 from brenton/bz1315151Brenton Leanhardt2016-03-0713-14/+27
|\ \ | | | | | | BZ1315151: Support openshift_image_tag
| * | Don't enable cockpit-ws for containerized installsBrenton Leanhardt2016-03-071-0/+1
| | |
| * | Support openshift_image_tagBrenton Leanhardt2016-03-0712-14/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the containerized openshift_pkg_version equivalent. Originally I was hoping to reuse openshift_pkg_version for containerized installs but the fact that it's very coupled to yum made that pretty ugly. However, I did opt to rely on the previously existing 'openshift_version' variable. Containerized and RPM installs can both use that variable and it will be set appropriately if either openshift_pkg_version or openshift_image_tag are set. I suspect someday containerized installs will be the only option and I didn't can to have thinkgs like openshift_pkg_version and openshift_image_tag in the playbooks anymore the necessary.
* | | Merge pull request #1540 from detiber/haproxy_tuningBrenton Leanhardt2016-03-072-0/+21
|\ \ \ | |/ / |/| | Add setting for configuring nofile limit for haproxy
| * | Add setting for configuring nofile limit for haproxyJason DeTiberus2016-03-072-0/+21
| | |
* | | Merge pull request #1558 from abutcher/31-minor-new-mastersBrenton Leanhardt2016-03-073-0/+3
|\ \ \ | | | | | | | | Default g_new_master_hosts in 3_1 minor upgrade.