summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4510 from ashcrow/system-container-inventoryOpenShift Bot2017-06-224-5/+27
|\ | | | | Merged by openshift-bot
| * doc: Add system_container examples to inventorySteve Milner2017-06-202-0/+22
| |
| * system_containers: Add openshift_ to other system_container varsSteve Milner2017-06-201-4/+4
| |
| * system_containers: Add openshift_ to use_system_containers varSteve Milner2017-06-202-5/+5
| |
* | Merge pull request #4364 from jcantrill/bz1457642_set_name_to_dcOpenShift Bot2017-06-212-1/+5
|\ \ | | | | | | Merged by openshift-bot
| * | bug 1457642. Use same SG index to avoid seeding timeoutJeff Cantrill2017-06-142-1/+5
| | |
* | | Merge pull request #4497 from ashcrow/atomic-version-checkOpenShift Bot2017-06-212-4/+22
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | oc_atomic_container: Require 1.17.2Steve Milner2017-06-192-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The oc_atomic_container module requires features only available in atomic versions 1.17.2+. Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1461662
* | | | Reverting v prefix introduced by stagecutJenkins CD Merge Bot2017-06-211-1/+1
| | | |
* | | | Merge pull request #4521 from bliemli/uninstall_fixScott Dodson2017-06-211-0/+1
|\ \ \ \ | | | | | | | | | | Restart NetworkManager only if dnsmasq was used
| * | | | Restart NetworkManager only if dnsmasq was usedBenjamin Affolter2017-06-211-0/+1
| | | | |
* | | | | Merge pull request #4520 from gpei/fix_exampleScott Dodson2017-06-212-2/+2
|\ \ \ \ \ | | | | | | | | | | | | remove extra close brace in example inventory
| * | | | | remove extra close brace in example inventorygpei2017-06-212-2/+2
| | | | | |
* | | | | | Merge pull request #4522 from rhcarvalho/no-package_upgrade-pre-installScott Dodson2017-06-211-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove package_update from install playbook
| * | | | | | Remove package_update from install playbookRodolfo Carvalho2017-06-211-1/+0
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | We observed in our CI environment that this check can't guarantee that an install would fail when the check fails, thus unless we can make its output match the fate of an install we shall keep it disabled.
* / | | | | Adding version field for stagecutJenkins CD Merge Bot2017-06-211-1/+1
|/ / / / /
* / / / / Automatic commit of package [openshift-ansible] release [3.6.122-1].Jenkins CD Merge Bot2017-06-212-2/+5
|/ / / / | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.122
* | | | Automatic commit of package [openshift-ansible] release [3.6.121-1].Jenkins CD Merge Bot2017-06-202-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.121
* | | | Merge pull request #4514 from ewolinetz/bz1462352Scott Dodson2017-06-201-1/+1
|\ \ \ \ | | | | | | | | | | Updating default from null to ""
| * | | | Updating default from null to ""ewolinetz2017-06-201-1/+1
|/ / / /
* | | / Automatic commit of package [openshift-ansible] release [3.6.120-1].Jenkins CD Merge Bot2017-06-202-2/+10
| |_|/ |/| | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.120
* | | Merge pull request #4292 from sdodson/push-via-dnsOpenShift Bot2017-06-207-0/+15
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | Update atomic-openshift-master.j2Scott Dodson2017-06-191-1/+1
| | | |
| * | | Enable push to registry via dns only on clean 3.6 installsScott Dodson2017-06-182-1/+4
| | | | | | | | | | | | | | | | | | | | We cannot assume that 3.5 to 3.6 upgrades were signed with the correct certs
| * | | Disable actually pushing to the registry via dns for nowScott Dodson2017-06-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to sort out how to know that the registry certificate has the proper hostnames attached to it. It will for 3.6 clean installs but not for 3.5 to 3.6 upgrades. For now make it opt in and come back to this.
| * | | Add openshift_node_dnsmasq role to upgradeScott Dodson2017-06-183-0/+5
| | | |
| * | | Push to the registry via dnsScott Dodson2017-06-183-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Configures OPENSHIFT_DEFAULT_REGISTRY=docker-registry.default.svc Adds 'cluster.local' to dns search on nodes via dispatcher script Adds '.svc' to NO_PROXY defaults
* | | | Automatic commit of package [openshift-ansible] release [3.6.119-1].Jenkins CD Merge Bot2017-06-202-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.119
* | | | Merge pull request #4489 from rhcarvalho/image-availability-no-tlsOpenShift Bot2017-06-191-1/+1
|\ \ \ \ | | | | | | | | | | Merged by openshift-bot
| * | | | Disable TLS verification in skopeo inspectRodolfo Carvalho2017-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some registries are not configured with valid certificates and thus the check fails with 'http: server gave HTTP response to HTTPS client'. Since this is not fetching images, but only checking for existence, trade security for convenience.
* | | | | Merge pull request #4486 from sdodson/etcdv3-clean-installOpenShift Bot2017-06-194-22/+20
|\ \ \ \ \ | | | | | | | | | | | | Merged by openshift-bot
| * | | | | Preserve etcd3 storage if it's already in useScott Dodson2017-06-184-22/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This would be the case if for instance they'd upgraded and then migrated.
* | | | | | Merge pull request #4484 from jarrpa/glusterfs-fixes-tooOpenShift Bot2017-06-1913-30/+82
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Merged by openshift-bot
| * | | | | GlusterFS: Generate better secret keysJose A. Rivera2017-06-162-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
| * | | | | GlusterFS: Fix error when groups.glusterfs_registry is undefined.Jose A. Rivera2017-06-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
| * | | | | GlusterFS: Use proper identity in heketi secretJose A. Rivera2017-06-162-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
| * | | | | GlusterFS: Allow configuration of heketi portJose A. Rivera2017-06-1610-12/+42
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
| * | | | | GlusterFS: Fix variable typoJose A. Rivera2017-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
| * | | | | GlusterFS: Minor template fixesJose A. Rivera2017-06-163-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
| * | | | | registry: mount GlusterFS storage volume from correct hostJose A. Rivera2017-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | | | | | Merge pull request #4491 from sdodson/fix-storage-migrationScott Dodson2017-06-191-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Temporarilly only migrate jobs as we were before
| * | | | | | Temporarilly only migrate jobs as we were beforeScott Dodson2017-06-191-2/+2
| | |_|_|/ / | |/| | | |
* | | | | | Automatic commit of package [openshift-ansible] release [3.6.117-1].Jenkins CD Merge Bot2017-06-192-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.117
* | | | | | Merge pull request #4329 from srampal/rhel_ose_aciOpenShift Bot2017-06-1820-24/+261
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Merged by openshift-bot
| * | | | | Add support for rhel, aci, vxlanSanjeev Rampal2017-05-3120-24/+261
| | | | | |
* | | | | | Merge pull request #4476 from mtnbikenc/storage-upgradeScott Dodson2017-06-187-44/+18
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Run storage upgrade pre and post master upgrade
| * | | | | Run storage upgrade pre and post master upgradeRussell Teague2017-06-187-44/+18
| | | | | |
* | | | | | Merge pull request #3954 from ingvagabund/etcd-migrateOpenShift Bot2017-06-1810-0/+398
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Merged by openshift-bot
| * | | | | Introduce etcd migrate roleJan Chaloupka2017-06-1710-0/+398
| | | | | |
* | | | | | Automatic commit of package [openshift-ansible] release [3.6.116-1].Jenkins CD Merge Bot2017-06-182-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.116