summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4033 from ↵Jan Chaloupka2017-05-103-40/+58
|\ | | | | | | | | ingvagabund/report-docker-image-version-and-excluder-rpm-version [RFE] report and fail if rpm version differs from docker image version
| * Fail if rpm version != docker image versionJan Chaloupka2017-05-093-40/+58
| |
* | Merge pull request #4130 from giuseppe/fix-audit-docScott Dodson2017-05-102-2/+2
|\ \ | | | | | | byo: correct option name
| * | byo: correct option nameGiuseppe Scrivano2017-05-092-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The correct name is "enabled', not "basicAuditEnabled" Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1439619 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #4097 from mtnbikenc/fix-version-checkScott Dodson2017-05-101-25/+29
|\ \ \ | | | | | | | | Properly fail on empty repoquery version checks
| * | | Properly fail if OpenShift RPM version is undefinedRussell Teague2017-05-081-25/+29
| | | |
* | | | Automatic commit of package [openshift-ansible] release [3.6.66-1].Scott Dodson2017-05-102-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --keep-version
* | | | Merge pull request #4116 from abutcher/bz1448824Jan Chaloupka2017-05-101-2/+2
|\ \ \ \ | | | | | | | | | | Fix additional master cert & client config creation
| * | | | Fix additional master cert & client config creation.Andrew Butcher2017-05-081-2/+2
| | | | |
* | | | | Merge pull request #4123 from rhcarvalho/remove-vim-lineRodolfo Carvalho2017-05-1019-43/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove vim configuration from Python files
| * | | | | Remove vim configuration from Python filesRodolfo Carvalho2017-05-0919-43/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a project where contributors are free to use whatever editor they want and we have linting tools that verify the proper formatting of Python files, it should not be required to have a vim-specific line in Python files.
* | | | | | Merge pull request #4106 from ashcrow/1448384OpenShift Bot2017-05-092-6/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | Use local variables for daemon.json templateSteve Milner2017-05-082-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using bare lists and dicts this change converts variables into json for use with daemon.json. jinja2 does have an ability to do this in side of templates, however it is only available in 2.9+. Until then the use of ansible's to_json in the playbook is being used. Refs: - http://jinja.pocoo.org/docs/2.9/templates/#tojson - http://docs.ansible.com/ansible/playbooks_filters.html#filters-for-formatting-data
* | | | | | | Merge pull request #4135 from mtnbikenc/fix-travisScott Dodson2017-05-091-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix issue with Travis-CI using old pip version
| * | | | | | | Fix issue with Travis-CI using old pip versionRussell Teague2017-05-091-0/+1
| | |_|_|_|/ / | |/| | | | |
* / | | | | | Automatic commit of package [openshift-ansible] release [3.6.62-1].Jenkins CD Merge Bot2017-05-092-2/+5
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | / / / / Automatic commit of package [openshift-ansible] release [3.6.61-1].Jenkins CD Merge Bot2017-05-092-2/+5
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | | | | Automatic commit of package [openshift-ansible] release [3.6.60-1].Jenkins CD Merge Bot2017-05-082-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | | | | Automatic commit of package [openshift-ansible] release [3.6.59-1].Jenkins CD Merge Bot2017-05-082-2/+9
| |_|/ / |/| | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | | | Merge pull request #4026 from ewolinetz/cherry_picks_15OpenShift Bot2017-05-087-13/+51
|\ \ \ \ | | | | | | | | | | Merged by openshift-bot
| * | | | Updating logging and metrics to restart api, ha and controllers when ↵ewolinetz2017-04-285-6/+30
| | | | | | | | | | | | | | | | | | | | updating master config
| * | | | Adding defaults for es_indicesewolinetz2017-04-271-2/+2
| | | | |
| * | | | Updating logic for generating pvcs and their counts to prevent reuse when ↵ewolinetz2017-04-272-7/+21
| | | | | | | | | | | | | | | | | | | | looping
* | | | | Automatic commit of package [openshift-ansible] release [3.6.58-1].Jenkins CD Merge Bot2017-05-082-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | | | | Merge pull request #4114 from jupierce/move_imagesScott Dodson2017-05-088-0/+0
|\ \ \ \ \ | |_|_|/ / |/| | | | Moving Dockerfile content to images dir
| * | | | Moving Dockerfile content to images dirjupierce2017-05-088-0/+0
|/ / / /
* | | | Automatic commit of package [openshift-ansible] release [3.6.57-1].Jenkins CD Merge Bot2017-05-082-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | | | Automatic commit of package [openshift-ansible] release [3.6.56-1].Jenkins CD Merge Bot2017-05-072-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | | | Automatic commit of package [openshift-ansible] release [3.6.55-1].Jenkins CD Merge Bot2017-05-062-2/+10
| |/ / |/| | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | | Merge pull request #4103 from ganhuang/fix_container_engineOpenShift Bot2017-05-056-24/+27
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | Fix 1448368, and some other minors issuesGan Huang2017-05-056-24/+27
| | | |
* | | | Merge pull request #4093 from richm/mux-result-startup-fixScott Dodson2017-05-052-2/+2
|\ \ \ \ | | | | | | | | | | mux startup is broken without this fix
| * | | | mux startup is broken without this fixRich Megginson2017-05-042-2/+2
| | | | |
* | | | | Merge pull request #3720 from giuseppe/installer-system-containerScott Dodson2017-05-0510-0/+313
|\ \ \ \ \ | | | | | | | | | | | | Installer as a system container
| * | | | | Dockerfile: create symlink for /opt/app-root/srcGiuseppe Scrivano2017-05-031-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and point it to /usr/share/ansible/openshift-ansible so that the file paths for this image are the same as for the Dockerfile.rhel7 image. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | docs: Add basic system container dev docsSteve Milner2017-05-033-0/+55
| | | | | |
| * | | | | installer: Add system container variable for log savingSteve Milner2017-05-034-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A new environment variable, VAR_LOG_ANSIBLE_LOG, was created to allow the installer to bind mount the location and write the log back to the host. By default the value is /var/log/ansible.log Example: atomic install --system --set INVENTORY_FILE=$(pwd)/hosts.inventory \ --set SSH_ROOT=/root/.ssh \ --set VAR_LOG_ANSIBLE_LOG=/some/log/location/ansible.log \ --set PLAYBOOK_FILE=./playbooks/byo/config.yml openshift-ansible
| * | | | | installer: support running as a system containerGiuseppe Scrivano2017-05-037-0/+239
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: atomic install --system --set INVENTORY_FILE=$(pwd)/hosts.inventory \ --set SSH_ROOT=/root/.ssh \ --set PLAYBOOK_FILE=./playbooks/byo/config.yml openshift-ansible Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | Automatic commit of package [openshift-ansible] release [3.6.54-1].Jenkins CD Merge Bot2017-05-052-2/+9
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | | | | Merge pull request #4077 from ingvagabund/move-etcdctl-profiles-to-etcd-commonJan Chaloupka2017-05-044-2/+6
|\ \ \ \ \ | | | | | | | | | | | | move etcdctl.yml from etcd to etcd_common role
| * | | | | move etcdctl.yml from etcd to etcd_common roleJan Chaloupka2017-05-034-2/+6
| | | | | |
* | | | | | Merge pull request #4044 from mtnbikenc/clean-cacheOpenShift Bot2017-05-042-11/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | Ensure repo cache is clean on the first runRussell Teague2017-05-032-11/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The openshift_repos role is modified to clean the repo cache on first run to ensure a clean cache in the situation where the repo files have been changed manually, such as just prior to upgrades.
* | | | | | | Merge pull request #4089 from mtnbikenc/unicode-decodeOpenShift Bot2017-05-0428-28/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | Allow oc_ modules to pass unicode resultsRussell Teague2017-05-0328-28/+28
| | | | | | | |
* | | | | | | | Merge pull request #4071 from ewolinetz/cherry_pick_htpasswdOpenShift Bot2017-05-042-11/+14
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Merged by openshift-bot
| * | | | | | | Modified pick from release-1.5 for updating hawkular htpasswd generationewolinetz2017-05-022-11/+14
| | | | | | | |
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.53-1].Jenkins CD Merge Bot2017-05-042-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | | | | | | | Merge pull request #4085 from ewolinetz/pick_issue4083OpenShift Bot2017-05-035-14/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | Correctly setting the primary and replica shard count settingsewolinetz2017-05-035-14/+2
| | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 18:07:26 +0000