summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Modified pick from release-1.5 for updating hawkular htpasswd generationewolinetz2017-05-022-11/+14
|
* Merge pull request #4028 from ewolinetz/logging_project_ns_labelsOpenShift Bot2017-05-022-11/+34
|\ | | | | Merged by openshift-bot
| * Adding way to add labels and nodeselectors to logging projectewolinetz2017-04-272-11/+34
| |
* | Automatic commit of package [openshift-ansible] release [3.6.50-1].Jenkins CD Merge Bot2017-05-022-2/+10
| | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | Merge pull request #4034 from ↵Jan Chaloupka2017-05-023-10/+20
|\ \ | | | | | | | | | | | | ingvagabund/move-excluder-verification-code-under-excluders-role [RFE] move excluder upgrade validation tasks under openshift_excluder role
| * | move excluder upgrade validation tasks under openshift_excluder roleJan Chaloupka2017-04-283-10/+20
| | |
* | | Merge pull request #3975 from sdodson/ansible_23_warningsOpenShift Bot2017-05-0143-83/+83
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | Don't double quote when conditionsScott Dodson2017-05-0140-80/+80
| | | |
| * | | Remove jinja template delimeters from when conditionsScott Dodson2017-05-0123-51/+51
| | | | | | | | | | | | | | | | | | | | | | | | In ansible 2.3 "[WARNING]: when statements should not include jinja2 templating delimiters such as {{ }} or {% %}. Found: {{ g_glusterfs_hosts is not defined }}"
* | | | Merge pull request #3865 from pilou-/fix_test_openssl_1.1.0OpenShift Bot2017-05-012-3/+4
|\ \ \ \ | | | | | | | | | | Merged by openshift-bot
| * | | | Fix test compatibility with OpenSSL 1.1.0Pierre-Louis Bonicoli2017-04-282-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since OpenSSL 1.1.0, default name options ('oneline') for 'x509' command include 'space_eq'. Explicitly enable 'oneline' in order to have one behaviour with all versions.
* | | | | Automatic commit of package [openshift-ansible] release [3.6.49-1].Jenkins CD Merge Bot2017-05-012-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | | | | Merge pull request #3986 from sdodson/require-2-2-2-0OpenShift Bot2017-05-013-20/+4
|\ \ \ \ \ | | | | | | | | | | | | Merged by openshift-bot
| * | | | | Bump ansible rpm dependency to 2.2.2.0Scott Dodson2017-04-253-20/+4
| | | | | | | | | | | | | | | | | | | | | | | | Remove check for unpatched 2.2.1.0
* | | | | | Merge pull request #3972 from lpsantil/masterScott Dodson2017-05-012-2/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update byo hosts examples with stronger warnings about Docker subnet overlap
| * | | | | | Warn users about conflicts with docker0 CIDR rangelpsantil2017-05-012-2/+16
| | | | | | |
* | | | | | | Automatic commit of package [openshift-ansible] release [3.6.48-1].Jenkins CD Merge Bot2017-05-012-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | | | | | | Automatic commit of package [openshift-ansible] release [3.6.47-1].Jenkins CD Merge Bot2017-05-012-2/+5
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | | / / / Automatic commit of package [openshift-ansible] release [3.6.46-1].Jenkins CD Merge Bot2017-05-012-2/+6
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | | | | Merge pull request #4027 from tbielawa/contrib_pre-commit_hookOpenShift Bot2017-05-014-0/+118
|\ \ \ \ \ | | | | | | | | | | | | Merged by openshift-bot
| * \ \ \ \ Merge branch 'master' into contrib_pre-commit_hookTim Bielawa2017-04-2818-196/+346
| |\ \ \ \ \
| * | | | | | Contrib: Hook to verify modules match assembled fragmentsTim Bielawa2017-04-284-0/+118
| | | | | | |
* | | | | | | Automatic commit of package [openshift-ansible] release [3.6.45-1].Jenkins CD Merge Bot2017-05-012-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | | | | | | Automatic commit of package [openshift-ansible] release [3.6.44-1].Jenkins CD Merge Bot2017-04-302-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | | | | | | Merge pull request #3817 from ingvagabund/polish-etcd-roleJan Chaloupka2017-04-3011-78/+89
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Refactor etcd roles
| * | | | | | | Refactor etcd rolesJan Chaloupka2017-04-2811-78/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - introduce block and simplify when conditions - introduce config.yml so the self-standing etcd role can be run (e.g. to test etcd cluster deployment) - remove empty task files - skip dependency on openshift_etcd_ca - replace cert paths with their appropriate variables
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.43-1].Jenkins CD Merge Bot2017-04-292-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | | | | | | | Merge pull request #4003 from lhuard1A/fix_registry_ose_3.2OpenShift Bot2017-04-283-33/+51
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | Fix OpenShift registry deployment on OSE 3.2Lénaïc Huard2017-04-253-33/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #4000
* | | | | | | | | Merge pull request #4018 from ewolinetz/issue4007OpenShift Bot2017-04-281-1/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | Merged by openshift-bot
| * | | | | | | | Adding checks for starting mux for 2.2.0ewolinetz2017-04-261-1/+4
| | | | | | | | |
* | | | | | | | | Merge pull request #3983 from rhcarvalho/docs-and-ciScott Dodson2017-04-285-123/+236
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | Document pull request process and improve contribution guide
| * | | | | | | | Document the Pull Request processRodolfo Carvalho2017-04-272-0/+88
| | | | | | | | |
| * | | | | | | | Add Table of ContentsRodolfo Carvalho2017-04-271-0/+16
| | | | | | | | |
| * | | | | | | | Improve Contribution GuideRodolfo Carvalho2017-04-271-56/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update how to submit contributions and how to run tests, reorganizing and expanding the content.
| * | | | | | | | Replace absolute with relative URLsRodolfo Carvalho2017-04-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the links point to the right place in different contexts (e.g., different branches).
| * | | | | | | | Move repo structure to a separate documentRodolfo Carvalho2017-04-272-55/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduces the clutter in CONTRIBUTING.md.
| * | | | | | | | Remove outdated information about PRsRodolfo Carvalho2017-04-271-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The contents are outdated and irrelevant since the "best practice" is automatically enforced. Documenting the PR flow is out of the Best Practices guide.
| * | | | | | | | Move link to BUILD.md to README.mdRodolfo Carvalho2017-04-272-5/+4
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most people contributing to the project do not need to build an RPM, so it can be left out of the Contribution Guide. Placing it in the README for still some visibility.
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.42-1].Jenkins CD Merge Bot2017-04-282-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | | | | | | | Merge pull request #3994 from codificat/boto-requirementOpenShift Bot2017-04-282-1/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | Add python-boto requirementPep Turró Mauri2017-04-252-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The AWS inventory (inventory/aws/hosts/ec2.py) uses the Boto library.
* | | | | | | | | Merge pull request #4009 from codificat/ex-job-fixOpenShift Bot2017-04-273-68/+80
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | Fix certificate check Job examplesPep Turró Mauri2017-04-263-68/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The example Job specifications were wrong (they had a Pod spec instead). Also fixing a tabs-vs-spaces problem in examples/README.md.
* | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.41-1].Jenkins CD Merge Bot2017-04-272-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | | | | | | | | | Merge pull request #4017 from mtnbikenc/fix-swapOpenShift Bot2017-04-272-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | Add bool for proper conditional handlingRussell Teague2017-04-262-2/+2
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.40-1].Jenkins CD Merge Bot2017-04-272-2/+6
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | | | | | | | | Merge pull request #3951 from lhuard1A/fix_bin_cluster_no_glusterfsOpenShift Bot2017-04-274-0/+8
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | Merged by openshift-bot
| * | | | | | | | Fix cluster creation with `bin/cluster` when there’s no glusterfs nodeLénaïc Huard2017-04-195-3/+11
| | | | | | | | |