summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1739 from ingvagabund/update-inventory-file-for-ose-playbookBrenton Leanhardt2016-04-193-442/+2
|\ | | | | Update inventory file for ansible playbook for OSE deployment.
| * Reference Setup for Origin and Ose from up-to-date docs.openshift.[com|org] ↵Jan Chaloupka2016-04-123-442/+2
| | | | | | | | | | | | | | | | | | instead of local README_[origin|OSE].md Update inventory file for ansible playbook for OSE deployment. - enterprise value for deployment_type is depricated. Use openshift-enterprise instead. - key=value pairs must be on the same line
* | Merge pull request #1734 from joelddiaz/tools-roles-moveJoel Diaz2016-04-19137-14190/+0
|\ \ | | | | | | cleanup roles after roles move to openshift-tools
| * | cleanup roles after roles move to openshift-toolsJoel Diaz2016-04-15137-14190/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also removing inventory/multi_inventory* things left behind unchanged even though they were copied: playbooks/adhoc/* roles/dns roles/kube_nfs_volumes roles/os_update_latest
* | | Automatic commit of package [openshift-ansible] release [3.0.81-1].Brenton Leanhardt2016-04-182-2/+7
| | |
* | | Merge pull request #1763 from sdodson/image-stream-syncBrenton Leanhardt2016-04-181-1/+1
|\ \ \ | | | | | | | | Use 'openshift3/' as IMAGE_PREFIX for enterprise logging and metrics
| * | | IMAGE_PREFIX=openshift3/ for enterprise logging/metricsScott Dodson2016-04-181-1/+1
| | | |
* | | | Merge pull request #1764 from smunilla/BZ1327139Brenton Leanhardt2016-04-182-14/+38
|\ \ \ \ | | | | | | | | | | a-o-i: Don't assume storage on 1st master
| * | | | a-o-i: Don't assume storage on 1st masterSamuel Munilla2016-04-182-14/+38
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Always prompt the user for a storage host. The prompt defaults to the first master and warns the user not to use a container-based installation for this. WIP
* | | | Merge pull request #1762 from brenton/docker1Brenton Leanhardt2016-04-181-1/+1
|\ \ \ \ | |/ / / |/| | | Bug 1320829 - Handle OSE 3.0 installs
| * | | Bug 1320829 - Handle OSE 3.0 installsBrenton Leanhardt2016-04-181-1/+1
|/ / /
* | | Automatic commit of package [openshift-ansible] release [3.0.80-1].Troy Dawson2016-04-152-2/+12
| | |
* | | Merge pull request #1746 from brenton/docker1Brenton Leanhardt2016-04-1510-39/+57
|\ \ \ | | | | | | | | The openshift_docker role must set the version facts for containerize…
| * | | Support mixed RPM/container installsBrenton Leanhardt2016-04-142-6/+6
| | | |
| * | | The openshift_docker role must set the version facts for containerized installsBrenton Leanhardt2016-04-149-37/+55
| | | | | | | | | | | | | | | | | | | | | | | | QE found that for fresh installs we were basing the docker version facts of the images that could be pulled prior to configuring /etc/sysconfig/docker. This is an edge case but something we need to fix.
* | | | Merge pull request #1755 from sdodson/docker-resetBrenton Leanhardt2016-04-151-14/+8
|\ \ \ \ | | | | | | | | | | Refactor docker failed state cleanup
| * | | | Refactor docker failed state cleanupScott Dodson2016-04-151-14/+8
| | | | |
* | | | | Merge pull request #1752 from sdodson/docker-resetBrenton Leanhardt2016-04-141-3/+15
|\| | | | | |/ / / |/| | | Enable docker before potentially resetting the failure
| * | | start it, check for failure, reset it, start againScott Dodson2016-04-141-8/+11
| | | |
| * | | Enable docker before potentially resetting the failureScott Dodson2016-04-141-1/+10
| | | |
* | | | Merge pull request #1753 from abutcher/mapping-methodBrenton Leanhardt2016-04-141-1/+1
|\ \ \ \ | |/ / / |/| | | Fix mappingMethod option in identity provider.
| * | | Fix mappingMethod option in identity provider.Andrew Butcher2016-04-141-1/+1
|/ / /
* | | Merge pull request #1738 from dgoodwin/image-policy-configBrenton Leanhardt2016-04-136-5/+27
|\ \ \ | | | | | | | | Support setting imagePolicyConfig JSON in inventory.
| * | | Support setting imagePolicyConfig JSON in inventory.Devan Goodwin2016-04-126-5/+27
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | For flexibility this is another pure JSON field to translate directly to yaml in the master config. Also updated to more safely handle JSON inventory variables as this uncovered a bug with booleans where you end up with a string containing json in your yaml.
* | | Automatic commit of package [openshift-ansible] release [3.0.79-1].Brenton Leanhardt2016-04-122-2/+17
| | |
* | | 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.