summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2770 from mtnbikenc/docker-fixRussell Teague2016-11-113-1/+19
|\ | | | | Resolve docker and iptables service dependencies
| * Resolve docker and iptables service dependenciesRussell Teague2016-11-113-1/+19
| | | | | | | | | | | | | | | | | | | | The docker service adds rules to the iptables configuration to support proper network functionality for running containers. If the service is started prior to iptables, these rules are not properly created. * Ensure iptables is started prior to docker Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1390835
* | Merge pull request #2783 from tbielawa/aoioutputTim Bielawa2016-11-101-0/+8
|\ \ | | | | | | Enable quiet output for all a-o-i commands
| * | Enable quiet output for all a-o-i commandsTim Bielawa2016-11-101-0/+8
| | | | | | | | | | | | | | | | | | | | | * Update: uninstall, upgrade, scaleup wf's * Verbosity can be toggled with -v flag, as before https://bugzilla.redhat.com/show_bug.cgi?id=1384294
* | | Merge pull request #2600 from mscherer/python3_portingScott Dodson2016-11-101-8/+17
|\ \ \ | | | | | | | | Port openshift_facts to py3
| * | | Port openshift_facts to py3Michael Scherer2016-10-141-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix configparser import - convert bytes to str using to_native - replace method that did got removed in py3 with six equivalent With ansible 2.2, python 3 start to be supported enough to run non trivial playbooks, and so a test run of openshift-ansible on F24 showed that openshift_facts.py needed to be ported.
* | | | Merge pull request #2779 from smunilla/BZ1339626Scott Dodson2016-11-101-1/+3
|\ \ \ \ | | | | | | | | | | Update override cluster_hostname
| * | | | Update override cluster_hostnameSamuel Munilla2016-11-101-1/+3
| | |/ / | |/| | | | | | | | | | | | | | | | | | Update the default for the override prompt and set both openshift_master_cluster_hostname and openshift_master_cluster_public_hostname
* | | | Merge pull request #2777 from dgoodwin/jenkins-role-bindingsScott Dodson2016-11-102-2/+14
|\ \ \ \ | | | | | | | | | | Reconcile role bindings for jenkins pipeline during upgrade.
| * | | | Reconcile role bindings for jenkins pipeline during upgrade.Devan Goodwin2016-11-102-2/+14
| | |_|/ | |/| | | | | | | | | | https://github.com/openshift/origin/issues/11170 for more info.
* | | | Merge pull request #2781 from rhcarvalho/travisScott Dodson2016-11-103-0/+18
|\ \ \ \ | | | | | | | | | | Add Travis integration
| * | | | Add Travis integrationRodolfo Carvalho2016-11-103-0/+18
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can run simple tests in every PR, while triggering our internal CI tests on manually selected PRs. This is a bit better than the all-or-nothing we have today. Running `make ci` in Travis is the same as the Jenkins 'default' job.
* | | | Merge pull request #2784 from abutcher/upgrade-embedded-etcdScott Dodson2016-11-101-1/+1
|\ \ \ \ | |/ / / |/| | | Bug 1393663 - Failed to upgrade v3.2 to v3.3
| * | | Default groups.oo_etcd_to_config when setting embedded_etcd in control plane ↵Andrew Butcher2016-11-101-1/+1
| |/ / | | | | | | | | | upgrade.
* | | Merge pull request #2766 from andrewklau/masterScott Dodson2016-11-092-19/+19
|\ \ \ | | | | | | | | Re-sync v1.4 image streams
| * | | Re-sync v1.4 image streamsAndrew Lau2016-11-092-19/+19
| | | |
* | | | Merge pull request #2776 from sdodson/BZ1390160Scott Dodson2016-11-091-2/+2
|\ \ \ \ | | | | | | | | | | Fix typos in openshift_facts gce cloud provider
| * | | | Fix typos in openshift_facts gce cloud providerScott Dodson2016-11-091-2/+2
|/ / / / | | | | | | | | | | | | | | | | Fixes Bug 1390160 Fixes BZ1390160
* | | | Merge pull request #2773 from sdodson/BZ1393187Scott Dodson2016-11-091-1/+1
|\ \ \ \ | | | | | | | | | | Don't upgrade etcd on backup operations
| * | | | Don't upgrade etcd on backup operationsScott Dodson2016-11-091-1/+1
| |/ / / | | | | | | | | | | | | | | | | Fixes Bug 1393187 Fixes BZ1393187
* | | | Merge pull request #2772 from sdodson/masterScott Dodson2016-11-091-1/+1
|\ \ \ \ | |_|/ / |/| | | Bump ansible requirement to 2.2.0.0-1 (GA)
| * | | Bump ansible requirement to 2.2.0.0-1 (GA)Scott Dodson2016-11-091-1/+1
| |/ /
* | | Merge pull request #2730 from dgoodwin/fix-ha-etcd-backupScott Dodson2016-11-091-1/+14
|\ \ \ | |/ / |/| | Fix HA etcd upgrade when facts cache has been deleted.
| * | Fix etcd backup failure due to corrupted facts.Devan Goodwin2016-11-091-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | Simplest way to reproduce this issue is to attempt to upgrade having removed /etc/ansible/facts.d/openshift.fact. Actual cause in the field is not entirely known but critically it is possible for embedded_etcd to default to true, causing the etcd fact lookup to check the wrong file and fail silently, resulting in no etcd_data_dir fact being set.
* | | Merge pull request #2764 from openshift/revert-2751-BZ1388253Scott Dodson2016-11-089-201/+66
|\ \ \ | | | | | | | | Revert "Revert openshift.node.nodename changes"
| * | | Revert "Revert openshift.node.nodename changes"Scott Dodson2016-11-089-201/+66
|/ / /
* | | Merge pull request #2762 from rhcarvalho/readme-nitsScott Dodson2016-11-081-0/+2
|\ \ \ | | | | | | | | README: fix markdown formatting
| * | | README: fix markdown formattingRodolfo Carvalho2016-11-081-0/+2
|/ / / | | | | | | | | | The old format doesn't render correctly in GitHub.
* | | Merge pull request #2727 from rhcarvalho/contributingScott Dodson2016-11-084-280/+153
|\ \ \ | | | | | | | | Contribution guide
| * | | Create contribution guideRodolfo Carvalho2016-11-082-15/+112
| | | |
| * | | Remove README_AEP.mdRodolfo Carvalho2016-11-082-234/+0
| | | | | | | | | | | | | | | | Not supported in this repo now.
| * | | README: move structure overview to the topRodolfo Carvalho2016-11-081-8/+9
| | | | | | | | | | | | | | | | | | | | It now appears in its own section, serving as a quick way to understand what is in the repository.
| * | | README: cleanup setup stepsRodolfo Carvalho2016-11-081-11/+14
| | | |
| * | | README: remove OSX setup requirementsRodolfo Carvalho2016-11-081-6/+0
| | | | | | | | | | | | | | | | OSX is not officially supported.
| * | | README: improve first paragraphRodolfo Carvalho2016-11-081-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | - Explain this repository can be used to install, upgrade and manage OpenShift clusters. - Move note about docker RPM to its own paragraph; link to issue.
| * | | README: add links, fix typosRodolfo Carvalho2016-11-081-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add links to improve experience of people understanding how the pieces fit together - s/ie/e.g./ - s/of //
| * | | README: improve markdown formattingRodolfo Carvalho2016-11-081-8/+11
| | | |
| * | | Make it easier to run Python testsRodolfo Carvalho2016-11-081-0/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Before one need to run: nosetests test/ utils/ Now: nosetests
* | | Merge pull request #2753 from jkhelil/proxy_settingsScott Dodson2016-11-081-2/+2
|\ \ \ | | | | | | | | Always add local dns domain to no_proxy
| * | | Always add local dns domain to no_proxyjawed2016-11-081-2/+2
| |/ /
* | | Merge pull request #2729 from tbielawa/BZ1390064Scott Dodson2016-11-081-4/+4
|\ \ \ | | | | | | | | Bug 1390064 - [quick install] a complete installed cluster was reported as a mix of installed and uninstalled env
| * | | Change the logic to just compare against masters and nodes.Tim Bielawa2016-11-071-4/+4
| | | |
* | | | Merge pull request #2751 from sdodson/BZ1388253Scott Dodson2016-11-089-66/+201
|\ \ \ \ | | | | | | | | | | Revert openshift.node.nodename changes
| * | | | Revert "Fix the nodeName of the OpenShift nodes on OpenStack"Scott Dodson2016-11-074-26/+176
| | | | | | | | | | | | | | | | | | | | This reverts commit aaaf82ba6032d0b1e9c36a39a7eda25b8c5f4b84.
| * | | | Revert "Fix OpenStack cloud provider"Scott Dodson2016-11-076-31/+19
| | | | | | | | | | | | | | | | | | | | This reverts commit 1f2276fff1e41c1d9440ee8b589042ee249b95d7.
| * | | | Revert "Check that OpenStack hostnames are resolvable"Scott Dodson2016-11-071-9/+6
| | | | | | | | | | | | | | | | | | | | This reverts commit 3cc2d6b019fa8a05ba480a7425cd654aa051355f.
* | | | | Merge pull request #2754 from jprovaznik/flannel_prefixScott Dodson2016-11-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | FIx flannel var name
| * | | | | FIx flannel var nameJan Provaznik2016-11-081-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | should be FLANNEL_ETCD_PREFIX Related to: #2635
* | | | | Merge pull request #2757 from dgoodwin/oom-upgrade-symlink-masterScott Dodson2016-11-081-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Add missing symlink for node openvswitch oom fix.
| * | | | | Add missing symlink for node openvswitch oom fix.Devan Goodwin2016-11-081-0/+1
| |/ / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 21:50:18 +0000