Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4103 from ganhuang/fix_container_engine | OpenShift Bot | 2017-05-05 | 6 | -24/+27 |
|\ | | | | | Merged by openshift-bot | ||||
| * | Fix 1448368, and some other minors issues | Gan Huang | 2017-05-05 | 6 | -24/+27 |
| | | |||||
* | | Merge pull request #4093 from richm/mux-result-startup-fix | Scott Dodson | 2017-05-05 | 2 | -2/+2 |
|\ \ | | | | | | | mux startup is broken without this fix | ||||
| * | | mux startup is broken without this fix | Rich Megginson | 2017-05-04 | 2 | -2/+2 |
| | | | |||||
* | | | Merge pull request #3720 from giuseppe/installer-system-container | Scott Dodson | 2017-05-05 | 10 | -0/+313 |
|\ \ \ | | | | | | | | | Installer as a system container | ||||
| * | | | Dockerfile: create symlink for /opt/app-root/src | Giuseppe Scrivano | 2017-05-03 | 1 | -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 docs | Steve Milner | 2017-05-03 | 3 | -0/+55 |
| | | | | |||||
| * | | | installer: Add system container variable for log saving | Steve Milner | 2017-05-03 | 4 | -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 container | Giuseppe Scrivano | 2017-05-03 | 7 | -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 Bot | 2017-05-05 | 2 | -2/+9 |
| |_|/ |/| | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog | ||||
* | | | Merge pull request #4077 from ingvagabund/move-etcdctl-profiles-to-etcd-common | Jan Chaloupka | 2017-05-04 | 4 | -2/+6 |
|\ \ \ | | | | | | | | | move etcdctl.yml from etcd to etcd_common role | ||||
| * | | | move etcdctl.yml from etcd to etcd_common role | Jan Chaloupka | 2017-05-03 | 4 | -2/+6 |
| | | | | |||||
* | | | | Merge pull request #4044 from mtnbikenc/clean-cache | OpenShift Bot | 2017-05-04 | 2 | -11/+17 |
|\ \ \ \ | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | Ensure repo cache is clean on the first run | Russell Teague | 2017-05-03 | 2 | -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-decode | OpenShift Bot | 2017-05-04 | 28 | -28/+28 |
|\ \ \ \ \ | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | Allow oc_ modules to pass unicode results | Russell Teague | 2017-05-03 | 28 | -28/+28 |
| | | | | | | |||||
* | | | | | | Merge pull request #4071 from ewolinetz/cherry_pick_htpasswd | OpenShift Bot | 2017-05-04 | 2 | -11/+14 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Merged by openshift-bot | ||||
| * | | | | | Modified pick from release-1.5 for updating hawkular htpasswd generation | ewolinetz | 2017-05-02 | 2 | -11/+14 |
| | | | | | | |||||
* | | | | | | Automatic commit of package [openshift-ansible] release [3.6.53-1]. | Jenkins CD Merge Bot | 2017-05-04 | 2 | -2/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog | ||||
* | | | | | | Merge pull request #4085 from ewolinetz/pick_issue4083 | OpenShift Bot | 2017-05-03 | 5 | -14/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | Correctly setting the primary and replica shard count settings | ewolinetz | 2017-05-03 | 5 | -14/+2 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #4049 from ashcrow/system-container-docker | OpenShift Bot | 2017-05-03 | 17 | -122/+394 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | Merged by openshift-bot | ||||
| * | | | | | | System container docker | Steve Milner | 2017-05-03 | 17 | -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-log | OpenShift Bot | 2017-05-03 | 1 | -0/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | Stop logging AWS credentials in master role. | Devan Goodwin | 2017-05-03 | 1 | -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/atomicf25 | OpenShift Bot | 2017-05-03 | 3 | -9/+11 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Merged by openshift-bot | ||||
| * | | | | | Remove set operations from openshift_master_certificates iteration. | Andrew Butcher | 2017-05-02 | 1 | -4/+4 |
| | | | | | | |||||
| * | | | | | Refactor system fact gathering to avoid dictionary size change during iteration. | Andrew Butcher | 2017-05-02 | 1 | -3/+5 |
| | | | | | | |||||
| * | | | | | Refactor secret generation for python3. | Andrew Butcher | 2017-05-02 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #4011 from jlebon/pr/rhci-fixes | OpenShift Bot | 2017-05-03 | 2 | -4/+3 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Merged by openshift-bot | ||||
| * | | | | | redhat-ci: use requirements.txt | Jonathan Lebon | 2017-04-26 | 2 | -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 Bot | 2017-05-03 | 2 | -2/+14 |
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog | ||||
* | | | | | Merge pull request #4070 from ewolinetz/mux_scaleup_fix | OpenShift Bot | 2017-05-02 | 2 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | Making mux with_items list evaluate as empty if didnt get objects before | ewolinetz | 2017-05-02 | 2 | -2/+2 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #4068 from mtnbikenc/fix-variants | Scott Dodson | 2017-05-02 | 1 | -3/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix variants for v3.6 | ||||
| * | | | | | Fix variants for v3.6 | Russell Teague | 2017-05-02 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1447204 | ||||
* | | | | | | Merge pull request #4038 from mtnbikenc/upgrade-refactor | OpenShift Bot | 2017-05-02 | 33 | -1294/+1384 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | etcd Upgrade Refactor | Russell Teague | 2017-05-02 | 5 | -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 Refactor | Russell Teague | 2017-05-02 | 7 | -301/+327 |
| | | | | | | | |||||
| * | | | | | | v3.4 Upgrade Refactor | Russell Teague | 2017-05-02 | 7 | -297/+323 |
| | | | | | | | |||||
| * | | | | | | v3.5 Upgrade Refactor | Russell Teague | 2017-05-02 | 7 | -308/+333 |
| | | | | | | | |||||
| * | | | | | | v3.6 Upgrade Refactor | Russell Teague | 2017-05-02 | 7 | -308/+333 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #4059 from sdodson/master-1.5-ca | OpenShift Bot | 2017-05-02 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | Use openshift_ca_host's hostnames to sign the CA | Scott Dodson | 2017-05-01 | 1 | -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_groups | OpenShift Bot | 2017-05-02 | 7 | -20/+9 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | Normalizing groups. | Kenny Woodson | 2017-05-01 | 7 | -20/+9 |
| | | | | | | | |||||
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.51-1]. | Jenkins CD Merge Bot | 2017-05-02 | 2 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog | ||||
* | | | | | | | Merge pull request #4053 from abutcher/rhsub-sans-std-include | OpenShift Bot | 2017-05-02 | 1 | -4/+0 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | Merged by openshift-bot | ||||
| * | | | | | | Remove std_include from playbooks/byo/rhel_subscribe.yml | Andrew Butcher | 2017-05-01 | 1 | -4/+0 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #4028 from ewolinetz/logging_project_ns_labels | OpenShift Bot | 2017-05-02 | 2 | -11/+34 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | Merged by openshift-bot |