summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5120 from smarterclayton/allow_gcs_registryScott Dodson2017-08-234-12/+15
|\ | | | | Allow GCS object storage to be configured
| * Allow GCS object storage to be configuredClayton Coleman2017-08-174-12/+15
| | | | | | | | | | | | Previously, setting the GCS registry object storage settings resulted in an invalid configuration. This generates a registry-config secret that has the correct file if the GCS config is set.
* | Merge pull request #5126 from ozdanborne/fix-calico-spacingScott Dodson2017-08-212-2/+2
|\ \ | | | | | | Fix missing space in calico ansible roles
| * | Fix missing space in calico ansible rolesDan Osborne2017-08-172-2/+2
| | |
* | | Merge pull request #4254 from dmsimard/registry_certsScott Dodson2017-08-214-49/+138
|\ \ \ | | | | | | | | Refactor openshift_hosted's docker-registry route setup
| * | | Refactor openshift_hosted's docker-registry route setupDavid Moreau-Simard2017-07-234-49/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have identified an issue where a docker-registry service set up as 'reencrypt' with a provided certificate and a self-signed certificate on the pod does not authorize users to push images. If the docker-registry service is set up as 'passthrough' with the same provided certificate, everything works. In light of this, this commit essentially adds support for configuring provided certificates with a passthrough route while maintaining backwards compatibility with the other use cases. The default remains 'passthrough' with self-generated certificates. Other miscellaneous changes include: - Move fact setup that were only used in secure.yml there - Omit the hostname for the route if there are none to configure, oc_route takes care of handling the default - Replace hardcoded /etc/origin/master by openshift_master_config_dir
* | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.104.0].Jenkins CD Merge Bot2017-08-202-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | Merge pull request #5142 from sdodson/fix-dnsScott Dodson2017-08-201-0/+1
|\ \ \ \ | | | | | | | | | | Ensure that openshift_node_facts has been called for dns_ip
| * | | | Ensure that openshift_node_facts has been called for dns_ipScott Dodson2017-08-181-0/+1
| | | | |
* | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.103.0].Jenkins CD Merge Bot2017-08-192-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.102.0].Jenkins CD Merge Bot2017-08-182-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.101.0].Jenkins CD Merge Bot2017-08-182-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.100.0].Jenkins CD Merge Bot2017-08-182-3/+182
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | Merge pull request #4784 from abutcher/noop-scaleupScott Dodson2017-08-182-0/+27
|\ \ \ \ \ | | | | | | | | | | | | Fail scaleup configuration when there are no new_nodes or new_masters
| * | | | | Fail within scaleup playbooks when new_{nodes,masters} host groups are empty.Andrew Butcher2017-07-182-0/+27
| | | | | |
* | | | | | Merge pull request #5132 from BrunoVernay/patch-1Scott Dodson2017-08-181-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Display "origin 3.6" as in previous installer 3.5
| * | | | | | Display "origin 3.6" as in previous installer 3.5Bruno Vernay2017-08-181-1/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Previous installer release v3.5 used to display the 3 variants. I keep OSE as the default, but proposes to add back the "origin v3.6" variant.
* | | | | | Merge pull request #5135 from makentenza/build-defaults-issueScott Dodson2017-08-182-4/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Change memory requests and limits units
| * | | | | Change memory requests and limits unitsMarcos Entenza2017-08-182-4/+4
| | | | | |
* | | | | | Merge pull request #4773 from jcantrill/fix_console_loggingOpenShift Bot2017-08-173-3/+31
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Merged by openshift-bot
| * | | | | fix missing console appending in loggingJeff Cantrill2017-08-173-3/+31
| | | | | |
* | | | | | Merge pull request #5111 from ozdanborne/calico-default-poolScott Dodson2017-08-175-4/+3
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Use sdn_cluster_network_cidr as default calico pool
| * | | | | Use sdn_cluster_network_cidr as default calico poolDan Osborne2017-08-175-4/+3
| | | | | |
* | | | | | Merge pull request #5106 from kwoodson/metrics_stdincludeOpenShift Bot2017-08-172-2/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Merged by openshift-bot
| * | | | | Adding std_include to the metrics playbook.Kenny Woodson2017-08-162-2/+6
| | | | | |
* | | | | | Merge pull request #5113 from bacek/masterScott Dodson2017-08-171-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Enable version 3.6 for OSE
| * | | | | | Enable version 3.6 for OSEVasily Chekalkin2017-08-171-2/+2
| | | | | | |
* | | | | | | Merge pull request #4547 from mtnbikenc/etcd-pre_upgrade-fixOpenShift Bot2017-08-171-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | Don't include noopRussell Teague2017-08-161-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #5107 from mtnbikenc/refactor-openshift_repos-depsOpenShift Bot2017-08-171-15/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | Remove openshift_repos dependenciesRussell Teague2017-08-161-15/+0
| | | | | | | | |
* | | | | | | | | Merge pull request #5026 from sosiouxme/20170808-fix-checksOpenShift Bot2017-08-174-8/+10
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | Merged by openshift-bot
| * | | | | | | | etc_traffic check: factor away short_versionLuke Meyer2017-08-152-6/+4
| | | | | | | | |
| * | | | | | | | openshift-checks: have playbooks invoke std_includeLuke Meyer2017-08-152-2/+6
| | | | | | | | |
* | | | | | | | | Merge pull request #4947 from ingvagabund/polish-openshift-master-roleOpenShift Bot2017-08-177-112/+208
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | polish openshift-master roleJan Chaloupka2017-08-167-112/+208
| | | | | | | | | |
* | | | | | | | | | Merge pull request #5098 from ashcrow/bin-sync-link-checkOpenShift Bot2017-08-161-0/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | bug: container_binary_sync no longer moves upon symlinksSteve Milner2017-08-151-0/+5
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With origin 1.5, /usr/local/bin/oc was a symlink to /usr/local/bin/openshift. During the container_binary_sync updated versions of both binaries are copied to the host. First openshift is copied to /usr/local/bin/openshift followed by copying oc to /usr/local/bin/oc. Since oc is a symlink back to /usr/local/bin/openshift the end result was everything linked to oc. This change adds a check before copying a binary. If the destination is a symlink then said symlink is removed before copying the new binary over. Fixed #4965 Reference: https://github.com/openshift/openshift-ansible/issues/4965
* | | | | | | | | | Merge pull request #5087 from sdodson/bz1481366OpenShift Bot2017-08-161-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | Merged by openshift-bot
| * | | | | | | | | Use openshift.node.dns_ip as listening addressScott Dodson2017-08-141-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #5096 from mtnbikenc/remove-orphansOpenShift Bot2017-08-162-15/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | Remove orphan filesRussell Teague2017-08-152-15/+0
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #5091 from mtnbikenc/standardize-std_includeOpenShift Bot2017-08-154-6/+10
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | | Standardize usage of std_include in byoRussell Teague2017-08-154-6/+10
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #5090 from mtnbikenc/validate_hostnamesOpenShift Bot2017-08-151-5/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | | Cleanup validate_hostnamesRussell Teague2017-08-151-5/+10
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #5048 from jcantrill/kibana_index_modeOpenShift Bot2017-08-154-0/+14
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | configure kibana index modeJeff Cantrill2017-08-104-0/+14
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #5084 from mtnbikenc/refactor-os_firewallScott Dodson2017-08-156-33/+33
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Additional os_firewall role refactoring
| * | | | | | | | | | | Additional os_firewall role refactoringRussell Teague2017-08-156-33/+33
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove openshift_facts dependency * Move firewall initialization from std_include.yml to openshift_cluster/config.yml Installing firewall packages is only necessary during OpenShift installation.