summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | Remove unused openshift_env_structures and openshift_envMichael Gugino2017-12-074-124/+8
| | | | | | | | | | | | | | | | | | | | This component of openshift_facts is no longer used.
* | | | | Merge pull request #6278 from mgugino-upstream-stage/service_typeMichael Gugino2017-12-0875-208/+224
|\ \ \ \ \ | | | | | | | | | | | | Remove openshift.common.service_type
| * | | | | Remove openshift.common.service_typeMichael Gugino2017-12-0775-208/+224
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit removes openshift.common.service_type in favor of openshift_service_type. This commit also removes r_openshift_excluder_service_type from plays in favor of using the role's defaults.
* | | | | | Merge pull request #6394 from mgugino-upstream-stage/os_firewall-prerequisitesScott Dodson2017-12-087-12/+6
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Add os_firewall to prerequisites.yml
| * | | | | Add os_firewall to prerequisites.ymlMichael Gugino2017-12-077-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This needs to be in place for crio. This role only installs and enables iptables, thus should only be run once.
* | | | | | Merge pull request #6385 from mjudeikis/hosted-template-varScott Dodson2017-12-074-0/+44
|\ \ \ \ \ \ | |/ / / / / |/| | | | | add 3.8 templates for gluster ep and svc
| * | | | | add 3.8 templates for gluster ep and svcLuke Meyer2017-12-072-0/+22
| | | | | |
| * | | | | add 3.8 templates for gluster ep and svcMangirdas2017-12-072-0/+22
| | | | | |
* | | | | | Merge pull request #6371 from mtnbikenc/include-to-import_playbookOpenShift Merge Robot2017-12-0753-280/+280
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Include Deprecation: Convert to import_playbook * Converts playbooks/ to use `import_playbook`. * Updates remaining `include:` tasks to `include_tasks:` Trello: https://trello.com/c/ZTyZu3UM/484-3-ansible-24-include-deprecation
| * | | | | | Include Deprecation: Convert to import_playbookRussell Teague2017-12-0754-281/+281
| | | | | | |
* | | | | | | Merge pull request #6387 from mgugino-upstream-stage/fix-auth-statScott Dodson2017-12-071-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Fix incorrect register name master registry auth
| * | | | | | Fix incorrect register name master registry authMichael Gugino2017-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Corrects register variable name to registry auth support. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1511374
* | | | | | | Merge pull request #6380 from sdodson/oc-admScott Dodson2017-12-0711-15/+17
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Remove all uses of openshift.common.admin_binary
| * | | | | | Remove all uses of openshift.common.admin_binaryScott Dodson2017-12-0711-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace with `oc adm`
* | | | | | | Merge pull request #6346 from ↵Michael Gugino2017-12-071-56/+16
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | mgugino-upstream-stage/remove-protected_facts_to_overwrite Remove unused protected_facts_to_overwrite
| * | | | | | Remove unused protected_facts_to_overwriteMichael Gugino2017-12-041-56/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This appears to be no longer used.
* | | | | | | Merge pull request #6362 from mgugino-upstream-stage/crt-playsScott Dodson2017-12-0724-343/+259
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Implement container_runtime playbooks and changes
| * | | | | | Implement container_runtime playbooks and changesMichael Gugino2017-12-0724-343/+259
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit refactors some duplicate code, removes usage of set_fact where not needed, and reorganizes container_runtime role to use include_role.
* | | | | | Merge pull request #6365 from mtnbikenc/consolidate-etcd-upgradeRussell Teague2017-12-0721-67/+64
|\ \ \ \ \ \ | | | | | | | | | | | | | | Playbook Consolidation - etcd Upgrade
| * | | | | | Playbook Consolidation - etcd UpgradeRussell Teague2017-12-0521-67/+64
| | | | | | |
* | | | | | | Merge pull request #6361 from mtnbikenc/consolidate-deploy-clusterScott Dodson2017-12-076-59/+52
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Playbook Consolidation - byo/config.yml
| * | | | | | | Playbook Consolidation - byo/config.ymlRussell Teague2017-12-066-59/+52
| | | | | | | |
* | | | | | | | Merge pull request #6372 from mtnbikenc/include-to-include_tasksOpenShift Merge Robot2017-12-0736-88/+82
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Include Deprecation: Convert to include_tasks For all roles/ * Converts to include_tasks: for dynamic includes * Converts to import_tasks: for static includes Trello: https://trello.com/c/ZTyZu3UM/484-3-ansible-24-include-deprecation
| * | | | | | | | Include Deprecation: Convert to include_tasksRussell Teague2017-12-0636-88/+82
| |/ / / / / / /
* | | | | | | | Merge pull request #6310 from tomassedovic/openstack-rhel-subscriptionMichael Gugino2017-12-072-21/+14
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Optionally subscribe OpenStack RHEL nodes
| * | | | | | | Remove shell environment lookupTomas Sedovic2017-12-011-2/+2
| | | | | | | |
| * | | | | | | Revert "Fix syntax error caused by an extra paren"Tomas Sedovic2017-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rhel_subscribe fixes will be done in a separate pull request. This reverts commit e05e4d3d4fab4eaf462a23f5d5ee39fb57f4f0a0.
| * | | | | | | Revert "Fix the env lookup fallback in rhel_subscribe"Tomas Sedovic2017-12-011-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rhel_subscribe role fixes will be done in a separate pull request. This reverts commit 691179281336dcd56d17b70cdf4067a142238b83.
| * | | | | | | Optionally subscribe OpenStack RHEL nodesTomas Sedovic2017-11-292-21/+14
| | | | | | | |
| * | | | | | | Fix the env lookup fallback in rhel_subscribeTomas Sedovic2017-11-291-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The role is looking for the usernames, passwords, etc. first in the shell environment and then in the Ansible vars. When the environment is empty, however, the lookup returns an empty string not an undefined variable, so the `default` fallback is never used and the ansible variables end up being ignored. By adding `True` to the end of the filter, it will work with any falsey value (including an empty string) not just undefined variables.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 04:49:22 +0000