summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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
| | | | | | |
* | | | | | | Merge pull request #4049 from ashcrow/system-container-dockerOpenShift Bot2017-05-0317-122/+394
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Merged by openshift-bot
| * | | | | | System container dockerSteve Milner2017-05-0317-122/+394
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows for the use of either the traditional package install of docker OR a system container install of docker. Two new inventory options, openshift_docker_use_system_container and openshift_docker_systemcontainer_image_registry_override, have been added which are be used to install with a system container. By default this option is commented out. One new fact has been added: - docker.service_name: docker by default, container-engine-docker for system container
* | | | | | Merge pull request #4080 from dgoodwin/aws-cred-no-logOpenShift Bot2017-05-031-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | Stop logging AWS credentials in master role.Devan Goodwin2017-05-031-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using lineinfile and with_items, the items end up logged and in this case include AWS credentials. Simple us of no_log to hide them.
* | | | | | Merge pull request #4062 from abutcher/atomicf25OpenShift Bot2017-05-033-9/+11
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Merged by openshift-bot
| * | | | | Remove set operations from openshift_master_certificates iteration.Andrew Butcher2017-05-021-4/+4
| | | | | |
| * | | | | Refactor system fact gathering to avoid dictionary size change during iteration.Andrew Butcher2017-05-021-3/+5
| | | | | |
| * | | | | Refactor secret generation for python3.Andrew Butcher2017-05-021-2/+2
| | | | | |
* | | | | | Merge pull request #4011 from jlebon/pr/rhci-fixesOpenShift Bot2017-05-032-4/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Merged by openshift-bot
| * | | | | redhat-ci: use requirements.txtJonathan Lebon2017-04-262-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use requirements.txt rather than hardcoding the ansible version here. Also update the comment re. `rpm-ostree status`.
* | | | | | Automatic commit of package [openshift-ansible] release [3.6.52-1].Jenkins CD Merge Bot2017-05-032-2/+14
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | | | | Merge pull request #4070 from ewolinetz/mux_scaleup_fixOpenShift Bot2017-05-022-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Merged by openshift-bot
| * | | | | Making mux with_items list evaluate as empty if didnt get objects beforeewolinetz2017-05-022-2/+2
| | |_|/ / | |/| | |
* | | | | Merge pull request #4068 from mtnbikenc/fix-variantsScott Dodson2017-05-021-3/+4
|\ \ \ \ \ | | | | | | | | | | | | Fix variants for v3.6
| * | | | | Fix variants for v3.6Russell Teague2017-05-021-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1447204
* | | | | | Merge pull request #4038 from mtnbikenc/upgrade-refactorOpenShift Bot2017-05-0233-1294/+1384
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | etcd Upgrade RefactorRussell Teague2017-05-025-80/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Renaming etcd_hosts_to_* to oo_etcd_hosts_to* * Moving host group evaluation to evaluate_groups.yml * Removing duplicate evaluate_groups.yml usage
| * | | | | | v3.3 Upgrade RefactorRussell Teague2017-05-027-301/+327
| | | | | | |
| * | | | | | v3.4 Upgrade RefactorRussell Teague2017-05-027-297/+323
| | | | | | |
| * | | | | | v3.5 Upgrade RefactorRussell Teague2017-05-027-308/+333
| | | | | | |
| * | | | | | v3.6 Upgrade RefactorRussell Teague2017-05-027-308/+333
| |/ / / / /
* | | | | | Merge pull request #4059 from sdodson/master-1.5-caOpenShift Bot2017-05-021-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | Use openshift_ca_host's hostnames to sign the CAScott Dodson2017-05-011-1/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | If for some reason oo_first_master and openshift_ca_host are different we could've signed the CA with the wrong hostnames.
* | | | | | Merge pull request #4045 from kwoodson/normalize_groupsOpenShift Bot2017-05-027-20/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | Normalizing groups.Kenny Woodson2017-05-017-20/+9
| | | | | | |
* | | | | | | Automatic commit of package [openshift-ansible] release [3.6.51-1].Jenkins CD Merge Bot2017-05-022-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog
* | | | | | | Merge pull request #4053 from abutcher/rhsub-sans-std-includeOpenShift Bot2017-05-021-4/+0
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Merged by openshift-bot
| * | | | | | Remove std_include from playbooks/byo/rhel_subscribe.ymlAndrew Butcher2017-05-011-4/+0
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 02:57:55 +0000