summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |/ /
* / / Automatic commit of package [openshift-ansible] release [3.4.17-1].Scott Dodson2016-11-042-2/+14
|/ /
* | Merge pull request #2721 from sdodson/image-stream-syncScott Dodson2016-11-0423-202/+433
|\ \ | | | | | | Image stream sync
| * | Update hosted_templatesScott Dodson2016-11-043-0/+47
| | |
| * | remove console exclusionsScott Dodson2016-11-041-1/+0
| | |
| * | Update v1.4 contentScott Dodson2016-11-0320-201/+386
| | |
* | | Merge pull request #2722 from smunilla/BZ1391515Scott Dodson2016-11-041-5/+5
|\ \ \ | | | | | | | | Fix indentation for flannel etcd vars
| * | | Fix indentation for flannel etcd varsSamuel Munilla2016-11-041-5/+5
| | | |
* | | | Merge pull request #2718 from dgoodwin/restart-api-alwaysScott Dodson2016-11-041-0/+1
|\ \ \ \ | | | | | | | | | | Restart API service always as well.
| * | | | Restart API service always as well.Devan Goodwin2016-11-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recently applied this fix for controllers due to the systemd-journald restart issue, it sounds as is this one is also sometimes affected. Containerized already uses this, so we will apply the same restart strategy here.
* | | | | Merge pull request #2710 from smunilla/BZ1391515Scott Dodson2016-11-031-11/+8
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | | Update flannel etcd vars for 0.5.5
| * | | Update flannel etcd vars for 0.5.5Samuel Munilla2016-11-032-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | flannel-0.5.5 uses different variable names in /etc/sysconfig/flannel. This writes both the old and next variable name to the file for quick compatibility. Fixes #2635 Fixes Bug 1391515
* | | | Merge pull request #2713 from smunilla/BZ1384291Scott Dodson2016-11-031-0/+12
|\ \ \ \ | |/ / / |/| | | Update quick installer upgrade mappings for 3.4
| * | | Update quick installer upgrade mappings for 3.4Samuel Munilla2016-11-031-0/+12
|/ / / | | | | | | | | | | | | | | | Just a quick addition for the upgrade playbooks for 3.4 Fixes Bug 1384291
* | | Merge pull request #2683 from smunilla/BZ1388754Scott Dodson2016-11-031-6/+22
|\ \ \ | | | | | | | | Update master_lb vs cluster_hostname workflow
| * | | Update master_lb vs cluster_hostname workflowSamuel Munilla2016-10-281-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | Previously, the messaging around setting cluster_hostname for single master setups was confusing. This should help with that as well as removing unecessary values from the cfg file.
* | | | Merge pull request #2707 from sdodson/tlsv12Scott Dodson2016-11-024-4/+4
|\ \ \ \ | |_|_|/ |/| | | Where we use curl force it to use tlsv1.2
| * | | Where we use curl force it to use tlsv1.2Scott Dodson2016-11-024-4/+4
|/ / / | | | | | | | | | | | | | | | | | | curl, prior to RHEL 7.2, did not properly negotiate up the TLS protocol, so force it to use tlsv1.2 Fixes bug 1390869
* | | Merge pull request #2703 from abutcher/etcd-ca-default-daysScott Dodson2016-11-021-1/+1
|\ \ \ | | | | | | | | Bump etcd_ca_default_days to 5 years.
| * | | Bump etcd_ca_default_days to 5 years.Andrew Butcher2016-11-021-1/+1
| | | |