summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6414 from mgugino-upstream-stage/remove-embedded-etcdOpenShift Merge Robot2017-12-1111-51/+7
|\ | | | | | | | | | | | | | | Automatic merge from submit-queue. Remove unneeded embedded etcd logic Removing some remaining embedded etcd facts except for the migration plays.
| * Remove unneeded embedded etcd logicMichael Gugino2017-12-0811-51/+7
| | | | | | | | | | Removing some remaining embedded etcd facts except for the migration plays.
* | Automatic commit of package [openshift-ansible] release [3.9.0-0.4.0].Jenkins CD Merge Bot2017-12-112-2/+6
| | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | Merge pull request #6418 from sdodson/bz1424102OpenShift Merge Robot2017-12-113-0/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Add missing dependencies on openshift_facts role All of these roles call the openshift_facts module but didn't include the role in their dependencies which can lead to errors in Ansible 2.4. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1524102
| * | Add missing dependencies on openshift_facts roleScott Dodson2017-12-103-0/+3
| | | | | | | | | | | | | | | | | | | | | All of these roles call the openshift_facts module but didn't include the role in their dependencies which can lead to errors in Ansible 2.4. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1524102
* | | Merge pull request #6393 from kwoodson/ansible_2.4_sg_fixScott Dodson2017-12-112-2/+905
|\ \ \ | | | | | | | | Copying upstream fix for ansible 2.4 ec2_group module.
| * | | Copying upstream fix for ansible 2.4 ec2_group module.Kenny Woodson2017-12-112-2/+905
| | | |
* | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.3.0].Jenkins CD Merge Bot2017-12-112-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | Merge pull request #6427 from sosiouxme/20171211-excise-integration-testsLuke Meyer2017-12-113-3/+0
|\ \ \ \ | | | | | | | | | | These don't affect anything but tox and travis tests. Since those are passing, going to just merge this.
| * | | | remove integration tests from toxLuke Meyer2017-12-113-3/+0
| | | | |
* | | | | Merge pull request #6402 from jmencak/cns-glusterfs_wipeScott Dodson2017-12-111-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Check for openshift attribute before using it during CNS install.
| * | | | | Check for openshift attribute before using it during CNS install.Jiri Mencak2017-12-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: BZ1523681
* | | | | | Merge pull request #6425 from joelddiaz/aws-readmeOpenShift Merge Robot2017-12-111-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. correct ansible-playbook command syntax
| * | | | | | correct ansible-playbook command syntaxJoel Diaz2017-12-111-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #6416 from mgugino-upstream-stage/upgrades-service-typeOpenShift Merge Robot2017-12-117-0/+13
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Add openshift_facts to upgrade plays for service_type Bring openshift_facts into scope for plays that utilize openshift_service_type as it is defined there.
| * | | | | Add openshift_facts to upgrade plays for service_typeMichael Gugino2017-12-097-0/+13
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | Bring openshift_facts into scope for plays that utilize openshift_service_type as it is defined there.
* | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.2.0].Jenkins CD Merge Bot2017-12-112-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | Merge pull request #6421 from mtnbikenc/fix-hosted-registryScott Dodson2017-12-111-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix openshift hosted registry rollout
| * | | | | Fix openshift hosted registry rolloutRussell Teague2017-12-111-1/+1
| | | | | |
* | | | | | Merge pull request #6422 from jarrpa/glusterfs-docScott Dodson2017-12-111-0/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | GlusterFS: Add playbook doc note
| * | | | | GlusterFS: Add playbook doc noteJose A. Rivera2017-12-111-0/+3
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
* | | | | Merge pull request #6406 from sdodson/remove-cr-depOpenShift Merge Robot2017-12-101-1/+0
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Remove container_runtime from the openshift_version We meant to remove this before merging #6316
| * | | | Remove container_runtime from the openshift_versionScott Dodson2017-12-081-1/+0
| | | | |
* | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.1.0].Jenkins CD Merge Bot2017-12-082-2/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | Merge pull request #6399 from mtnbikenc/cleanup-byo-refsOpenShift Merge Robot2017-12-0823-132/+119
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Cleanup byo references * Remove playbooks/byo/config.yml, replaced by playbooks/deploy_cluster.yml * Update example inventories * Update doc references to 'byo' paths
| * | | | | Cleanup byo referencesRussell Teague2017-12-0823-132/+119
|/ / / / /
* | | | | Merge pull request #6136 from jmencak/tuned-uninstall-bz1509129Scott Dodson2017-12-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Uninstall tuned-profiles-atomic-openshift-node as defined in origin.spec
| * | | | | Uninstall tuned-profiles-atomic-openshift-node as defined in origin.specJiri Mencak2017-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The origin.spec file defines two variants of tuned rpm packages: tuned-profiles-atomic-openshift-node and tuned-profiles-origin-node. Uninstall them both. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1509129
* | | | | | Merge pull request #6356 from jcantrill/1519622_disable_revision_historyJeff Cantrill2017-12-081-0/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | bug 1519622. Disable rollback of ES DCs
| * | | | | bug 1519622. Disable rollback of ES DCsJeff Cantrill2017-12-051-0/+1
| | | | | |
* | | | | | Merge pull request #6323 from tomassedovic/rhel-subscribeMichael Gugino2017-12-084-32/+49
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove reading shell environment in rhel_subscribe
| * | | | | | Don't check for the deployment_typeTomas Sedovic2017-12-051-1/+0
| | | | | | |
| * | | | | | Get the correct value out of openshift_releaseTomas Sedovic2017-12-051-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `openshift_release` contents can come in the form of `v3.6.0` which we need to turn to `3.6` to get the right repo name.
| * | | | | | Use openshift_release instead of ose_versionTomas Sedovic2017-12-043-3/+2
| | | | | | |
| * | | | | | Remove the ose_version checkTomas Sedovic2017-12-041-6/+0
| | | | | | |
| * | | | | | Fix toxTomas Sedovic2017-12-011-0/+1
| | | | | | |
| * | | | | | Remove reading shell environment in rhel_subscribeTomas Sedovic2017-12-014-25/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rhel_subscribe role used to read the shell environment variables for its input with a broken fallback to Ansible variables. This updates the role to only use Ansible vars. If the user wants to do an env lookup, they can do so when calling the role.
* | | | | | | Merge pull request #6320 from dgoodwin/containerized-inventory-symlinkOpenShift Merge Robot2017-12-081-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix inventory symlinks in origin-ansible container. When attempting to run openshift-ansible in a kubernetes pod, we attempted to use a configmap to mount in our inventory to run against. However kubernetes mounts configmaps/secrets volumes through the use of relative symlinks. The use of "cp -a" in this script then copies a relative symlink to /tmp which is now dangling, and ansible will fail to run. This patch changes to just copy the file regularly resulting in a value temp file that is not a symlink.
| * | | | | | Fix inventory symlinks in origin-ansible container.Devan Goodwin2017-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When attempting to run openshift-ansible in a kubernetes pod, we attempted to use a configmap to mount in our inventory to run against. However kubernetes mounts configmaps/secrets volumes through the use of relative symlinks. The use of "cp -a" in this script then copies a relative symlink to /tmp which is now dangling, and ansible will fail to run. This patch changes to just copy the file regularly resulting in a value temp file that is not a symlink.
* | | | | | | Merge pull request #6316 from giuseppe/fix-syscontainers-installationScott Dodson2017-12-087-3/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | syscontainers: fix CRI-O and container-engine installation
| * | | | | | | openshift_node: reintroduce restart of CRI-O.Giuseppe Scrivano2017-12-081-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change introduced with 39cf5084f18e2e0adca46b925660a6f2c38d227c Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | | | container-engine: skip openshift_docker_log_driver when it is FalseGiuseppe Scrivano2017-12-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | | | container-engine: log-opts is a dictionary in the daemon.json fileGiuseppe Scrivano2017-12-083-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | | | openshift_version: add dependency to openshift_factsGiuseppe Scrivano2017-12-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | | | openshift_version: define openshift_use_crio_onlyGiuseppe Scrivano2017-12-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | | | openshift_version: add dependency to container_runtimeGiuseppe Scrivano2017-12-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | | | crio: define and use l_is_node_system_containerGiuseppe Scrivano2017-12-082-1/+4
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | | Merge pull request #6398 from mtnbikenc/update-deprecation-checksOpenShift Merge Robot2017-12-0812-35/+35
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Update deprecation checks - include: Updating deprecation tests to check for `include:` directive usage. Trello: https://trello.com/c/ZTyZu3UM/484-3-ansible-24-include-deprecation Fixes: https://github.com/openshift/openshift-ansible/issues/5586
| * | | | | | Update deprecation checks - include:Russell Teague2017-12-0812-35/+35
| | | | | | |
* | | | | | | Merge pull request #6364 from ↵Michael Gugino2017-12-084-124/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mgugino-upstream-stage/remove-openshift_env_structures Remove unused openshift_env_structures and openshift_env