Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2600 from mscherer/python3_porting | Scott Dodson | 2016-11-10 | 1 | -8/+17 |
|\ | | | | | Port openshift_facts to py3 | ||||
| * | Port openshift_facts to py3 | Michael Scherer | 2016-10-14 | 1 | -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/BZ1339626 | Scott Dodson | 2016-11-10 | 1 | -1/+3 |
|\ \ | | | | | | | Update override cluster_hostname | ||||
| * | | Update override cluster_hostname | Samuel Munilla | 2016-11-10 | 1 | -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-bindings | Scott Dodson | 2016-11-10 | 2 | -2/+14 |
|\ \ \ | | | | | | | | | Reconcile role bindings for jenkins pipeline during upgrade. | ||||
| * | | | Reconcile role bindings for jenkins pipeline during upgrade. | Devan Goodwin | 2016-11-10 | 2 | -2/+14 |
| | | | | | | | | | | | | | | | | https://github.com/openshift/origin/issues/11170 for more info. | ||||
* | | | | Merge pull request #2781 from rhcarvalho/travis | Scott Dodson | 2016-11-10 | 3 | -0/+18 |
|\ \ \ \ | | | | | | | | | | | Add Travis integration | ||||
| * | | | | Add Travis integration | Rodolfo Carvalho | 2016-11-10 | 3 | -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-etcd | Scott Dodson | 2016-11-10 | 1 | -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 Butcher | 2016-11-10 | 1 | -1/+1 |
| |/ / | | | | | | | | | | upgrade. | ||||
* | | | Merge pull request #2766 from andrewklau/master | Scott Dodson | 2016-11-09 | 2 | -19/+19 |
|\ \ \ | | | | | | | | | Re-sync v1.4 image streams | ||||
| * | | | Re-sync v1.4 image streams | Andrew Lau | 2016-11-09 | 2 | -19/+19 |
| | | | | |||||
* | | | | Merge pull request #2776 from sdodson/BZ1390160 | Scott Dodson | 2016-11-09 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Fix typos in openshift_facts gce cloud provider | ||||
| * | | | | Fix typos in openshift_facts gce cloud provider | Scott Dodson | 2016-11-09 | 1 | -2/+2 |
|/ / / / | | | | | | | | | | | | | | | | | Fixes Bug 1390160 Fixes BZ1390160 | ||||
* | | | | Merge pull request #2773 from sdodson/BZ1393187 | Scott Dodson | 2016-11-09 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Don't upgrade etcd on backup operations | ||||
| * | | | | Don't upgrade etcd on backup operations | Scott Dodson | 2016-11-09 | 1 | -1/+1 |
| |/ / / | | | | | | | | | | | | | | | | | Fixes Bug 1393187 Fixes BZ1393187 | ||||
* | | | | Merge pull request #2772 from sdodson/master | Scott Dodson | 2016-11-09 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | Bump ansible requirement to 2.2.0.0-1 (GA) | ||||
| * | | | Bump ansible requirement to 2.2.0.0-1 (GA) | Scott Dodson | 2016-11-09 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #2730 from dgoodwin/fix-ha-etcd-backup | Scott Dodson | 2016-11-09 | 1 | -1/+14 |
|\ \ \ | |/ / |/| | | Fix HA etcd upgrade when facts cache has been deleted. | ||||
| * | | Fix etcd backup failure due to corrupted facts. | Devan Goodwin | 2016-11-09 | 1 | -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-BZ1388253 | Scott Dodson | 2016-11-08 | 9 | -201/+66 |
|\ \ \ | | | | | | | | | Revert "Revert openshift.node.nodename changes" | ||||
| * | | | Revert "Revert openshift.node.nodename changes" | Scott Dodson | 2016-11-08 | 9 | -201/+66 |
|/ / / | |||||
* | | | Merge pull request #2762 from rhcarvalho/readme-nits | Scott Dodson | 2016-11-08 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | README: fix markdown formatting | ||||
| * | | | README: fix markdown formatting | Rodolfo Carvalho | 2016-11-08 | 1 | -0/+2 |
|/ / / | | | | | | | | | | The old format doesn't render correctly in GitHub. | ||||
* | | | Merge pull request #2727 from rhcarvalho/contributing | Scott Dodson | 2016-11-08 | 4 | -280/+153 |
|\ \ \ | | | | | | | | | Contribution guide | ||||
| * | | | Create contribution guide | Rodolfo Carvalho | 2016-11-08 | 2 | -15/+112 |
| | | | | |||||
| * | | | Remove README_AEP.md | Rodolfo Carvalho | 2016-11-08 | 2 | -234/+0 |
| | | | | | | | | | | | | | | | | Not supported in this repo now. | ||||
| * | | | README: move structure overview to the top | Rodolfo Carvalho | 2016-11-08 | 1 | -8/+9 |
| | | | | | | | | | | | | | | | | | | | | It now appears in its own section, serving as a quick way to understand what is in the repository. | ||||
| * | | | README: cleanup setup steps | Rodolfo Carvalho | 2016-11-08 | 1 | -11/+14 |
| | | | | |||||
| * | | | README: remove OSX setup requirements | Rodolfo Carvalho | 2016-11-08 | 1 | -6/+0 |
| | | | | | | | | | | | | | | | | OSX is not officially supported. | ||||
| * | | | README: improve first paragraph | Rodolfo Carvalho | 2016-11-08 | 1 | -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 typos | Rodolfo Carvalho | 2016-11-08 | 1 | -10/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add links to improve experience of people understanding how the pieces fit together - s/ie/e.g./ - s/of // | ||||
| * | | | README: improve markdown formatting | Rodolfo Carvalho | 2016-11-08 | 1 | -8/+11 |
| | | | | |||||
| * | | | Make it easier to run Python tests | Rodolfo Carvalho | 2016-11-08 | 1 | -0/+2 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before one need to run: nosetests test/ utils/ Now: nosetests | ||||
* | | | Merge pull request #2753 from jkhelil/proxy_settings | Scott Dodson | 2016-11-08 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Always add local dns domain to no_proxy | ||||
| * | | | Always add local dns domain to no_proxy | jawed | 2016-11-08 | 1 | -2/+2 |
| |/ / | |||||
* | | | Merge pull request #2729 from tbielawa/BZ1390064 | Scott Dodson | 2016-11-08 | 1 | -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 Bielawa | 2016-11-07 | 1 | -4/+4 |
| | | | | |||||
* | | | | Merge pull request #2751 from sdodson/BZ1388253 | Scott Dodson | 2016-11-08 | 9 | -66/+201 |
|\ \ \ \ | | | | | | | | | | | Revert openshift.node.nodename changes | ||||
| * | | | | Revert "Fix the nodeName of the OpenShift nodes on OpenStack" | Scott Dodson | 2016-11-07 | 4 | -26/+176 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit aaaf82ba6032d0b1e9c36a39a7eda25b8c5f4b84. | ||||
| * | | | | Revert "Fix OpenStack cloud provider" | Scott Dodson | 2016-11-07 | 6 | -31/+19 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit 1f2276fff1e41c1d9440ee8b589042ee249b95d7. | ||||
| * | | | | Revert "Check that OpenStack hostnames are resolvable" | Scott Dodson | 2016-11-07 | 1 | -9/+6 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit 3cc2d6b019fa8a05ba480a7425cd654aa051355f. | ||||
* | | | | | Merge pull request #2754 from jprovaznik/flannel_prefix | Scott Dodson | 2016-11-08 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | FIx flannel var name | ||||
| * | | | | | FIx flannel var name | Jan Provaznik | 2016-11-08 | 1 | -1/+1 |
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | should be FLANNEL_ETCD_PREFIX Related to: #2635 | ||||
* | | | | | Merge pull request #2757 from dgoodwin/oom-upgrade-symlink-master | Scott Dodson | 2016-11-08 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Add missing symlink for node openvswitch oom fix. | ||||
| * | | | | | Add missing symlink for node openvswitch oom fix. | Devan Goodwin | 2016-11-08 | 1 | -0/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #2759 from sdodson/flannel-containerized | Scott Dodson | 2016-11-08 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Install flannel RPM on containerized but not atomic | ||||
| * | | | | | Install flannel RPM on containerized but not atomic | Scott Dodson | 2016-11-08 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #2752 from sdodson/cluster-cidr-refactor | Scott Dodson | 2016-11-08 | 1 | -4/+9 |
|\ \ \ \ \ | |/ / / / |/| | | | | Refactor default sdn_cluster_network_cidr and sdn_host_subnet_length | ||||
| * | | | | Refactor default sdn_cluster_network_cidr and sdn_host_subnet_length | Scott Dodson | 2016-11-07 | 1 | -4/+9 |
|/ / / / | | | | | | | | | | | | | | | | | Inventory values highest priority, then anything in master-config.yaml, then defaults last. |