summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Don't upgrade etcd on backup operationsScott Dodson2016-11-091-1/+1
| | | | | Fixes Bug 1393187 Fixes BZ1393187
* 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
| |/ / /
* | | | Merge pull request #2759 from sdodson/flannel-containerizedScott Dodson2016-11-081-1/+1
|\ \ \ \ | | | | | | | | | | Install flannel RPM on containerized but not atomic
| * | | | Install flannel RPM on containerized but not atomicScott Dodson2016-11-081-1/+1
| |/ / /
* | | | Merge pull request #2752 from sdodson/cluster-cidr-refactorScott Dodson2016-11-081-4/+9
|\ \ \ \ | |/ / / |/| | | Refactor default sdn_cluster_network_cidr and sdn_host_subnet_length
| * | | Refactor default sdn_cluster_network_cidr and sdn_host_subnet_lengthScott Dodson2016-11-071-4/+9
|/ / / | | | | | | | | | | | | Inventory values highest priority, then anything in master-config.yaml, then defaults last.
* | | Merge pull request #2652 from smunilla/BZ1320952_default_for_clusterNetworkCIDRScott Dodson2016-11-073-13/+27
|\ \ \ | |/ / |/| | Update defaults for clusterNetworkCIDR & hostSubnetLength
| * | Update defaults for clusterNetworkCIDR & hostSubnetLengthSamuel Munilla2016-11-033-13/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per https://github.com/openshift/openshift-docs/issues/1700: The default values for pod networking have changed: - clusterNetworkCIDR now defaults to 10.128.0.0/14 (10.128.0.0 - 10.131.255.255) rather than 10.1.0.0/16. - hostSubnetLength now defaults to 9 rather than 8 (meaning each node will be assigned a /23 subnet rather than a /24) Fixes Bug 1320952
* | | Merge pull request #2749 from sallyom/give_AWS_creds_no_logAndrew Butcher2016-11-071-0/+1
|\ \ \ | | | | | | | | set AWS creds task with no_logs
| * | | set AWS creds task with no_logsSally O'Malley2016-11-071-0/+1
| | | |
* | | | Merge pull request #2735 from rhcarvalho/deadcodeScott Dodson2016-11-073-8/+0
|\ \ \ \ | |/ / / |/| | | Remove some dead code
| * | | a-o-i: remove dummy data_fileRodolfo Carvalho2016-11-052-6/+0
| | | |
| * | | a-o-i: remove script leftover from OpenShift v2Rodolfo Carvalho2016-11-051-2/+0
| | | |
* | | | Merge pull request #2696 from tbielawa/more_unit_testsScott Dodson2016-11-071-1/+29
|\ \ \ \ | | | | | | | | | | Add some tests for utils to get the coverage up
| * | | | Add some tests for utils to get the coverage up.Tim Bielawa2016-11-041-1/+29
| | | | |
* | | | | Merge pull request #2732 from dougbtv/openstack_shade_fixScott Dodson2016-11-071-0/+1
|\ \ \ \ \ | | | | | | | | | | | | [openstack] updates documentation to show that you need to install shade
| * | | | | [openstack] updates documentation to show that you need to install shadedougbtv2016-11-051-0/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #2739 from harobed/issue_2717Scott Dodson2016-11-076-249/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove unused playbooks adhoc metrics_setup files #2717
| * | | | | Remove unused playbooks adhoc metrics_setup files #2717Stéphane Klein2016-11-076-249/+0
| |/ / / /
* | | | | Merge pull request #2741 from harobed/issue_2740Scott Dodson2016-11-071-2/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove unused openshift-ansible/inventory/hosts file #2740
| * | | | | Remove unused openshift-ansible/inventory/hosts file #2740Stéphane Klein2016-11-071-2/+0
| |/ / / /
* | | | | Merge pull request #2743 from harobed/issue_2742Scott Dodson2016-11-071-0/+9
|\ \ \ \ \ | |_|_|_|/ |/| | | | Append /inventory/README.md to explain what is BYO inventory folder
| * | | | Append /inventory/README.md to explain what is BYO inventory folder #2742Stéphane Klein2016-11-071-0/+9
| |/ / /
* | | | Merge pull request #2728 from sjenning/fix-gce-multizoneScott Dodson2016-11-074-0/+23
|\ \ \ \ | |/ / / |/| | | default to multizone GCE config
| * | | default to multizone GCE configSeth Jennings2016-11-044-0/+23
| |/ /