summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix yaml formattingMatthew Wong2017-10-274-5/+15
|
* Merge pull request #4559 from giuseppe/ansible-change-default-ansible-configScott Dodson2017-06-231-1/+1
|\ | | | | images, syscontainer: change default value for ANSIBLE_CONFIG
| * images, syscontainer: change default value for ANSIBLE_CONFIGGiuseppe Scrivano2017-06-231-1/+1
| | | | | | | | | | | | | | | | Change it to /usr/share/atomic-openshift-utils/ansible.cfg Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1461281 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | Merge pull request #4549 from sdodson/image-stream-syncScott Dodson2017-06-238-98/+489
|\ \ | | | | | | Sync 3.5 cfme templates over to 3.6
| * | Sync 3.5 cfme templates over to 3.6Scott Dodson2017-06-228-98/+489
| | |
* | | Automatic commit of package [openshift-ansible] release [3.6.123-1].Jenkins CD Merge Bot2017-06-232-2/+28
| | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.123
* | | Merge pull request #4548 from sosiouxme/20170622-build-image-multiple-tagsScott Dodson2017-06-222-41/+35
|\ \ \ | |/ / |/| | releases: enable build/push with multiple tags
| * | releases: enable build/push with multiple tagsLuke Meyer2017-06-222-41/+35
| | |
* | | Merge pull request #4528 from mtnbikenc/update-templatesScott Dodson2017-06-2226-36/+519
|\ \ \ | | | | | | | | Update template examples for 3.6
| * | | Update template examples for 3.6Russell Teague2017-06-2126-36/+519
| | | |
* | | | Merge pull request #4503 from giuseppe/fix-unable-to-mask-service-etcd_containerOpenShift Bot2017-06-221-3/+10
|\ \ \ \ | |_|/ / |/| | | Merged by openshift-bot
| * | | etcd, system_container: do not mask etcd_containerGiuseppe Scrivano2017-06-201-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1462087 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | etcd, system_container: do not enable system etcdGiuseppe Scrivano2017-06-201-2/+2
| | |/ | |/| | | | | | | | | | | | | | | | if etcd is installed and it is not the system container, only unmask the service but do not enable it. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #4498 from mtnbikenc/verify-upgrade-node-labelScott Dodson2017-06-221-20/+25
|\ \ \ | | | | | | | | Verify matched openshift_upgrade_nodes_label
| * | | Verify matched openshift_upgrade_nodes_labelRussell Teague2017-06-191-20/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Verifies the provided label matches a set of hosts prior to upgrading. If the label didn't match hosts, the upgrade would silently proceed with upgrading all nodes given the logic for creating the oo_nodes_to_upgrade group.
* | | | Merge pull request #4516 from kwoodson/limit_refsOpenShift Bot2017-06-224-13/+20
|\ \ \ \ | | | | | | | | | | Merged by openshift-bot
| * | | | Fixed readme doc.Kenny Woodson2017-06-211-12/+12
| | | | |
| * | | | Adding option for serviceAccountConfig.limitSecretReferencesKenny Woodson2017-06-204-13/+20
| | | | |
* | | | | Merge pull request #4505 from ↵Jan Chaloupka2017-06-221-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ingvagabund/set-proper-etcd-data-dir-for-system-container set proper etcd_data_dir for system container
| * | | | | set proper etcd_data_dir for system containerJan Chaloupka2017-06-201-1/+1
| |/ / / /
* | | | | Merge pull request #4504 from ingvagabund/restart-the-right-etcd-serviceJan Chaloupka2017-06-221-1/+1
|\ \ \ \ \ | | | | | | | | | | | | detect etcd service name based on etcd runtime when restarting
| * | | | | detect etcd service name based on etcd runtime when restartingJan Chaloupka2017-06-201-1/+1
| |/ / / /
* | | | | 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