summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3191 from mtnbikenc/gitignore-cleanupScott Dodson2017-01-261-7/+5
|\ | | | | .gitignore cleanup
| * .gitignore cleanupRussell Teague2017-01-261-7/+5
| | | | | | | | | | | | | | | | | | - Escaping hash for emacs temp files so it is not a comment line - *.iml is covered by .idea/ - multi_inventory.yaml is unused - Only ignore the root ansible.cfg, we have another ansible.cfg `git ls-files -i --exclude-standard` - .tox and cover are directories
* | Merge pull request #2973 from AlbertoPeon/metrics_urlScott Dodson2017-01-263-6/+5
|\ \ | | | | | | Set metrics url even if metrics_deploy is false
| * | Set metrics url even if metrics_deploy is falseAlberto Peon2017-01-203-6/+5
| | |
* | | Merge pull request #3182 from abutcher/no-proxy-listScott Dodson2017-01-266-6/+6
|\ \ \ | |_|/ |/| | Comma separate no_proxy host list in openshift_facts
| * | Comma separate no_proxy host list in openshift_facts so that it appears as a ↵Andrew Butcher2017-01-256-6/+6
| | | | | | | | | | | | string everywhere it is used.
* | | Merge pull request #3181 from sdodson/10seconds-ought-to-be-enoughScott Dodson2017-01-252-0/+10
|\ \ \ | | | | | | | | Add 10 second wait after disabling firewalld/iptables
| * | | Add 10 second wait after disabling firewalldScott Dodson2017-01-252-0/+10
| | | |
* | | | Merge pull request #3156 from abutcher/ansible-unsafe-textScott Dodson2017-01-251-1/+5
|\ \ \ \ | | | | | | | | | | Fix yaml representer error seen with ansible-2.2.1.0
| * | | | Make use of AnsibleDumper in openshift_master filters s.t. we can represent ↵Andrew Butcher2017-01-231-1/+5
| | | | | | | | | | | | | | | | | | | | AnsibleUnsafeText when dumping yaml.
* | | | | Merge pull request #3159 from twiest/oc_secretThomas Wiest2017-01-258-0/+2281
|\ \ \ \ \ | |_|_|/ / |/| | | | Added oc_secret to lib_openshift.
| * | | | Added oc_secret to lib_openshift.Thomas Wiest2017-01-258-0/+2281
|/ / / /
* | | | Merge pull request #3141 from tbielawa/fragment_bannersAndrew Butcher2017-01-257-2/+188
|\ \ \ \ | | | | | | | | | | Fragment banners
| * | | | Generate the artifacts from fragments.Tim Bielawa2017-01-245-0/+116
| | | | |
| * | | | Update the generators to include fragment bannersTim Bielawa2017-01-242-2/+72
| | | | |
* | | | | Merge pull request #3178 from abutcher/free-master-countAndrew Butcher2017-01-251-9/+1
|\ \ \ \ \ | | | | | | | | | | | | Remove master_count restriction.
| * | | | | Remove master_count restriction.Andrew Butcher2017-01-251-9/+1
| | | | | |
* | | | | | Merge pull request #3177 from mtnbikenc/pipdep-fixJason DeTiberus2017-01-251-5/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | flake8 mccabe dependency fix
| * | | | | flake8 mccabe dependency fixRussell Teague2017-01-251-5/+2
| | | | | |
* | | | | | Merge pull request #3133 from mwringe/hawkular-metrics-0.23-updateScott Dodson2017-01-251-0/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Template update for Hawkular Metrics 0.23
| * | | | | Template update for Hawkular Metrics 0.23mwringe2017-01-191-0/+2
| | |_|_|/ | |/| | |
* | | | | Automatic commit of package [openshift-ansible] release [3.5.2-1].Scott Dodson2017-01-252-2/+63
| | | | |
* | | | | Merge pull request #3176 from sdodson/image-stream-syncScott Dodson2017-01-255-94/+134
|\ \ \ \ \ | | | | | | | | | | | | Sync latest image streams
| * | | | | Sync latest image streamsScott Dodson2017-01-255-94/+134
| | | | | |
* | | | | | Merge pull request #3172 from detiber/gceNodeNameScott Dodson2017-01-251-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | override nodename for gce with cloudprovider
| * | | | | | override nodename for gce with cloudproviderJason DeTiberus2017-01-241-0/+2
| | | | | | |
* | | | | | | Merge pull request #3169 from jcantrill/logging_node_selectorScott Dodson2017-01-257-0/+27
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | allow openshift_logging role to specify nodeSelectors
| * | | | | | allow openshift_logging role to specify nodeSelectorsJeff Cantrill2017-01-247-0/+27
| |/ / / / /
* | | | | | Merge pull request #3173 from lhuard1A/ose_3.4Scott Dodson2017-01-251-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow RHEL subscription for OSE 3.4
| * | | | | | Allow RHEL subscription for OSE 3.4Lénaïc Huard2017-01-251-2/+2
| | | | | | |
* | | | | | | Merge pull request #3147 from andrewklau/haproxy-containerScott Dodson2017-01-253-4/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix containerized haproxy config
| * | | | | | | Fix containerized haproxy configAndrew Lau2017-01-253-4/+8
| | | | | | | |
* | | | | | | | Merge pull request #3171 from ewolinetz/logging_local_file_creationJason DeTiberus2017-01-243-68/+34
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | fixes jks generation, node labeling, and rerunning for oauth secrets
| * | | | | | | | fixes jks generation, node labeling, and rerunning for oauth secretsewolinetz2017-01-243-68/+34
| | | | | | | | |
* | | | | | | | | Merge pull request #3150 from jcantrill/bz_1415447_stop_heasterJason DeTiberus2017-01-241-5/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | Conditionally include metrics start/stop
| * | | | | | | | fixes BZ-1415447. Error when stopping heapster. Modify to be conditional ↵Jeff Cantrill2017-01-241-5/+2
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | include
* | | | | | | | Merge pull request #2981 from dgoodwin/upgrade-wait-for-nodeJason DeTiberus2017-01-241-0/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Wait for nodes to be ready before proceeding with upgrade.
| * | | | | | | | Wait for nodes to be ready before proceeding with upgrade.Devan Goodwin2016-12-151-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Near the end of node upgrade, we now wait for the node to report Ready before marking it schedulable again. This should help eliminate delays when pods need to relocate as the next node in line is evacuated. Happens near the end of the process, the only remaining task would be to mark it schedulable again so easy for admins to detect and recover from.
* | | | | | | | | Merge pull request #3164 from mtnbikenc/firewalld_fixJason DeTiberus2017-01-241-2/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove is_containerized check for firewalld installs
| * | | | | | | | | Remove is_containerized check for firewalld installsRussell Teague2017-01-241-2/+3
| | | | | | | | | |
* | | | | | | | | | Merge pull request #3142 from bparees/forcepull_quotesScott Dodson2017-01-243-11/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | treat force_pull as a bool
| * | | | | | | | | treat force_pull as a boolBen Parees2017-01-233-11/+2
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | bug https://bugzilla.redhat.com/show_bug.cgi?id=1414756
* | | | | | | | | Merge pull request #3166 from abutcher/pylintRussell Teague2017-01-241-6/+23
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [openshift_facts] pylint cleanse
| * | | | | | | | | Clean up pylint for delete_empty_keys.Andrew Butcher2017-01-241-6/+23
| | | | | | | | | |
* | | | | | | | | | Merge pull request #3165 from abutcher/fix-default-iptables-argsScott Dodson2017-01-241-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | [os_firewall] Fix default iptables args.
| * | | | | | | | | [os_firewall] Fix default iptables args.Andrew Butcher2017-01-241-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #3125 from ashcrow/serial-master-upgrade-docJason DeTiberus2017-01-242-0/+76
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | HOOKS.md added documenting new hooks
| * | | | | | | | | Added link to HOOKS in READMESteve Milner2017-01-231-0/+6
| | | | | | | | | |
| * | | | | | | | | HOOKS.md added documenting new hooksSteve Milner2017-01-231-0/+70
| | | | | | | | | |
* | | | | | | | | | Merge pull request #3044 from mtnbikenc/docker-optionsJason DeTiberus2017-01-243-1/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add new option 'docker_selinux_enabled'
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 19:20:22 +0000