summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5382 from mtnbikenc/add-lb-configScott Dodson2017-09-141-0/+6
|\ | | | | Add loadbalancer config entry point
| * Add loadbalancer config entry pointRussell Teague2017-09-131-0/+6
| |
* | Merge pull request #5420 from ashcrow/update-versions-in-masterScott Dodson2017-09-142-10/+10
|\ \ | | | | | | inventory: Update versions to 3.7
| * | inventory: Update versions to 3.7Steve Milner2017-09-142-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | Updated the versions in inventory to point to 3.7 by default since 3.6 has already been released. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1491592 Signed-off-by: Steve Milner <smilner@redhat.com>
* | | Merge pull request #5360 from sdodson/embedded-etcdScott Dodson2017-09-141-4/+7
|\ \ \ | |/ / |/| | Clarify requirement of having etcd group
| * | Clarify requirement of having etcd groupScott Dodson2017-09-111-4/+7
| | |
* | | Merge pull request #5410 from jmencak/tuned-after-node-restartScott Dodson2017-09-141-4/+4
|\ \ \ | | | | | | | | Setup tuned after the node has been restarted.
| * | | Setup tuned after the node has been restarted.Jiri Mencak2017-09-141-4/+4
| | | |
* | | | Merge pull request #5396 from abutcher/etcd-migrate-openshift-ipScott Dodson2017-09-141-3/+3
|\ \ \ \ | | | | | | | | | | Use openshift.common.ip rather than ansible_default_ipv4 in etcd migration playbook.
| * | | | Use openshift.common.ip rather than ansible_default_ipv4 in etcd migration ↵Andrew Butcher2017-09-131-3/+3
| | |_|/ | |/| | | | | | | | | | playbook.
* | | | Merge pull request #5367 from abutcher/etcd-scaleup-master-client-urlsScott Dodson2017-09-142-0/+27
|\ \ \ \ | | | | | | | | | | Bug 1490304: Etcd scale-up playbook should add new member to etcdClientInfo of master-config.yaml
| * | | | Update master config with new client urls during etcd scaleup.Andrew Butcher2017-09-122-0/+27
| | | | |
* | | | | Merge pull request #5381 from ewolinetz/37_bz1487648_OpenShift Bot2017-09-141-0/+3
|\ \ \ \ \ | | | | | | | | | | | | Merged by openshift-bot
| * | | | | Adding mangagement-admin SC to admin role for management-infra projectEric Wolinetz2017-09-121-0/+3
| | | | | |
* | | | | | Merge pull request #5389 from tremble/storage_migrationScott Dodson2017-09-141-9/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Don't assume storage_migration control variables are already boolean
| * | | | | | Don't assume storage_migration control variables are already booleanMark Chappell2017-09-131-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | openshift_upgrade_pre_storage_migration_enabled openshift_upgrade_pre_storage_migration_fatal openshift_upgrade_post_storage_migration_enabled openshift_upgrade_post_storage_migration_enabled because the 4 variables are not already defaulted/evaluated there's no guarantee that they're actually the boolean type at this point. Example: if they're passed in on the command line
* | | | | | | Merge pull request #5043 from juanvallejo/jvallejo/add-inventory-generator-imageScott Dodson2017-09-144-1/+506
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Merge inventory-generator with origin-ansible image
| * | | | | | | inventory generate: fix config docLuke Meyer2017-09-131-2/+2
| | | | | | | |
| * | | | | | | inventory generate: remove refs to openshift_cluster_userLuke Meyer2017-09-133-13/+4
| | | | | | | |
| * | | | | | | inventory generate: always use kubeconfig, no loginLuke Meyer2017-09-131-10/+2
| | | | | | | |
| * | | | | | | add inventory-generator under new sub pkgjuanvallejo2017-09-124-1/+523
| | | | | | | |
* | | | | | | | Merge pull request #5399 from tbielawa/masterScott Dodson2017-09-141-2/+4
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | Scaffold out the entire build defaults hash
| * | | | | | | Scaffold out the entire build defaults hashTim Bielawa2017-09-131-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some functions called later may expect sub-keys to exist which will not with the current default empty-dict.
* | | | | | | | Merge pull request #5395 from sdodson/bz1480442Scott Dodson2017-09-1310-10/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add IMAGE_VERSION to the image stream tag source
| * | | | | | | | Add IMAGE_VERSION to the image stream tag sourceScott Dodson2017-09-1310-10/+10
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #5151 from jarrpa/gluster-portsScott Dodson2017-09-131-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | GlusterFS: Correct firewall port names
| * | | | | | | | GlusterFS: Correct firewall port namesJose A. Rivera2017-08-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | | | | | | | | Merge pull request #5315 from jarrpa/glusterfs-fixes-3.7Scott Dodson2017-09-1315-2/+563
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | GlusterFS: Various fixes
| * | | | | | | | | GlusterFS: Allow option to use or ignore default node selectorsJose A. Rivera2017-09-065-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
| * | | | | | | | | GlusterFS: Clarify heketi URL documentationJose A. Rivera2017-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
| * | | | | | | | | GlusterFS: Add files/templates for v3.7Jose A. Rivera2017-09-0610-0/+555
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | | | | | | | | | Merge pull request #5394 from sosiouxme/20170912-health-role-bz1487548OpenShift Bot2017-09-131-0/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | openshift-checks: add role symlinkLuke Meyer2017-09-121-0/+1
| | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes bug 1487548 https://bugzilla.redhat.com/show_bug.cgi?id=1487548
* | | | | | | | | | Merge pull request #5370 from jmencak/tuned-openshift-ansible-bad_merge-fixOpenShift Bot2017-09-132-14/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | Re-enabling new tuned profile hierarchy (PR5089)Jiri Mencak2017-09-122-14/+4
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #5405 from ewolinetz/issue_5403Scott Dodson2017-09-131-1/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Removing setting of pod presets
| * | | | | | | | | | | Removing setting of pod presetsEric Wolinetz2017-09-131-1/+0
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #5359 from mgugino-upstream-stage/version-docker-auth-configOpenShift Bot2017-09-1311-34/+111
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | | Fix: authenticated registry support for containerized hostsMichael Gugino2017-09-1111-34/+111
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, openshift-anisble supports authentication to container registries to pull down openshift container images. The openshift_verison role uses the docker cli to gather image information from container registries before authentication credentials are provided by openshift-ansible. This commit creates the necessary token to authenticate to private registries during openshift_version. The token is generated by the role 'docker' on all hosts where docker is installed/configured when oreg_auth_users is defined. This commit also adds a read-only mount into the openshift master and node container services. This mount is '/var/lib/origin/.docker:/root/.docker:ro'. This is because the container images do not currently read the values in '/var/lib/origin/.docker' as this may be a bug upstream. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1316341
* | | | | | | | | | | Merge pull request #5402 from ashcrow/fix-cri-o-image-nameScott Dodson2017-09-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | cri-o: Fix Fedora image name
| * | | | | | | | | | cri-o: Fix Fedora image nameSteve Milner2017-09-131-1/+1
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Steve Milner <smilner@redhat.com>
* | | | | | | | | | Merge pull request #5379 from mtnbikenc/fix-jinja2-openshift_hostedOpenShift Bot2017-09-133-4/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | Correct logic for openshift_hosted_*_waitRussell Teague2017-09-123-4/+4
| | | | | | | | | | |
| * | | | | | | | | | Workaround Ansible Jinja2 delimiter warningRussell Teague2017-09-122-2/+2
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This workaround prevents the warnings on using Jinja2 templating delimiters in `when:` conditions in cases where a variable is used as the conditional. This has been fixed in Ansible 2.4. https://github.com/ansible/ansible/pull/25092
* | | | | | | | | | Merge pull request #5386 from ashcrow/fix-wording-in-upgrade-noticeOpenShift Bot2017-09-131-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | Merged by openshift-bot
| * | | | | | | | | upgrade: Updates warning on missing required variablesSteve Milner2017-09-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Steve Milner <smilner@redhat.com>
* | | | | | | | | | Merge pull request #5321 from mtnbikenc/proposal-processScott Dodson2017-09-132-0/+57
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [Proposal] OpenShift-Ansible Proposal Process
| * | | | | | | | | | [Proposal] OpenShift-Ansible Proposal ProcessRussell Teague2017-09-112-0/+57
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #5377 from ingvagabund/double-required-disk-space-etcd-backupOpenShift Bot2017-09-133-4/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | double the required disk space for etcd backupJan Chaloupka2017-09-123-4/+3
| | | | | | | | | | |