summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Collapse)AuthorAgeFilesLines
* move (and rename) get_dns_ip filter into openshift_node_factsJoel Diaz2017-09-122-1/+33
| | | | | | | | | | | | | | | | | | | | Due to a combination of unexpected behavior when resolving filter plugins in Ansible and recent changes to filter_plugins/openshift_node.py, when trying to run a current version of the openshift_node_facts role on a system with an older version of the openshift-ansible-filter-plugins RPM, the role will fail. File "/usr/share/ansible_plugins/filter_plugins/openshift_node.py", line 30, in get_dns_ip if bool(hostvars['openshift']['common']['use_dnsmasq']): KeyError: 'use_dnsmasq' It's not possible for us to have our current RPM version (presently openshift-ansible-filter-plugins-3.5.120-1.git.0.c60f69a.el7.noarch) and a newer RPM installed and run both current openshift-ansible code and older checked-out/vendored releases (for older clusters/releases). Since only the openshift_node_facts role uses the get_dns_ip filter, move the functionality into a role-specific filter plugin. In addition, rename the filter plugin to 'node_get_dns_ip' because Ansible is prefering the get_dns_ip from the RPM (ie /usr/share/ansible_plugins/filter_plugins/openshift_node.py) over the role-specific filter plugin of the same name. Ansile prefers the filter plugins in /usr/share/ansible_plugins/filter_plugins/* even when /etc/ansible/ansible.cfg is set to something like: filter_plugins = filter_plugins:/usr/share/ansible_plugins/filter_plugins:filter_plugins <--- yes, 'filter_plugins' before and after /usr/share/ansible_plugins/filter_plugins (ansible 2.3.1.0) Renaming the filter plugin function ensures that roles that depend on the old implementation can continue to use it through what the older RPM provides, and the new role can use it's role-specific filter plugin without any variable namespace colisions. Lastly, remove filter_plugins/openshift_node.py since it is now self-contained in roles/openshift_node_facts.
* Merge pull request #5338 from mtnbikenc/fix-pre_upgradeOpenShift Bot2017-09-112-1/+5
|\ | | | | Merged by openshift-bot
| * Fix issue with etcd_common when using pre_upgrade tagRussell Teague2017-09-082-1/+5
| |
* | Merge pull request #5289 from jcantrill/1487573_fix_allowed_es_versionOpenShift Bot2017-09-085-10/+10
|\ \ | |/ |/| Merged by openshift-bot
| * bug 1487573. Bump the allowed ES versionsJeff Cantrill2017-09-015-10/+10
| |
* | Merge pull request #5209 from wozniakjan/logging_es_probeOpenShift Bot2017-09-072-1/+15
|\ \ | | | | | | Merged by openshift-bot
| * | elasticsearch: reintroduce readiness probeJan Wozniak2017-08-292-1/+15
| | |
* | | Consolidating AWS roles and variables underneath openshift_aws role.Kenny Woodson2017-09-0746-984/+876
| | |
* | | Merge pull request #5208 from mgugino-upstream-stage/remove-openshift_commonOpenShift Bot2017-09-0746-340/+121
|\ \ \ | | | | | | | | Merged by openshift-bot
| * | | Remove openshift-commonMichael Gugino2017-09-0646-340/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of this role's purpose was to set facts. The vast majority of these facts were simply redefining user-supplied variables. This commit also removes various artifacts leftover from previous versions, as well as variables that seem to be entirely unused.
* | | | Merge pull request #5310 from ashcrow/split-rhel-centos-crioOpenShift Bot2017-09-071-2/+8
|\ \ \ \ | | | | | | | | | | Merged by openshift-bot
| * | | | cri-o: Split RHEL and CentOS imagesSteve Milner2017-09-061-2/+8
| | | | |
* | | | | Merge pull request #5162 from aerialls/patch-2OpenShift Bot2017-09-071-9/+9
|\ \ \ \ \ | | | | | | | | | | | | Merged by openshift-bot
| * | | | | reverse order between router cert generationJulien Brochet2017-08-231-9/+9
| | | | | |
| * | | | | ensured to always use a certificate for the routerJulien Brochet2017-08-221-1/+1
| | | | | |
* | | | | | Merge pull request #5296 from nak3/skeopeo-command-outputOpenShift Bot2017-09-061-4/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | output skopeo image check commandKenjiro Nakayama2017-09-051-4/+6
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #5276 from richm/masterOpenShift Bot2017-09-065-1/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | logging set memory request to limitJeff Cantrill2017-08-305-1/+11
| | | | | | |
* | | | | | | Merge pull request #5148 from kwoodson/registry_proxy_updatesOpenShift Bot2017-09-061-0/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | Adding proxy env vars for dc/docker-registryKenny Woodson2017-08-211-0/+8
| | | | | | | |
* | | | | | | | Merge pull request #5067 from e-minguez/flannel_use_sdn_cluster_network_cidrScott Dodson2017-09-062-4/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Use the proper pod subnet instead the services one
| * | | | | | | | Use the proper pod subnet instead the services oneEduardo Minguez Perez2017-08-292-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4809 ?
* | | | | | | | | Merge pull request #5299 from jhadvig/dnf_issueScott Dodson2017-09-063-12/+22
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Import dnf only if importing yum fails
| * | | | | | | | | openshift_checks aos_version: also check installed under yumLuke Meyer2017-09-063-17/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tweaks to the logic around using yum vs dnf; now uses ansible_pkg_mgr to determine which is in effect for a host. Also, extended the yum logic to check installed packages in addition to available packages in the aos_version module so that disconnected installs and others with weird repo configs need not disable the package_version check.
| * | | | | | | | | Import dnf only if importing yum failsJakub Hadvig2017-09-051-6/+12
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #5202 from giuseppe/crio-additional-registriesOpenShift Bot2017-09-062-0/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | cri-o: add support for additional registriesGiuseppe Scrivano2017-08-242-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support added to CRI-O with: https://github.com/kubernetes-incubator/cri-o/commit/a35727c80bd2a26613aae21db00628045cb9be24 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | | | | | Merge pull request #5313 from sjenning/remove-experimental-cri-flagScott Dodson2017-09-061-2/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | remove experimental-cri flag from node config
| * | | | | | | | | | remove experimental-cri flag from node configSeth Jennings2017-09-061-2/+0
| | | | | | | | | | |
* | | | | | | | | | | Fix openshift_master_config_dirScott Dodson2017-09-061-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #5306 from mgugino-upstream-stage/fix-master-systemd-unitsOpenShift Bot2017-09-061-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | Fix: set openshift_master_config_dir to the correct value.Michael Gugino2017-09-051-1/+1
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous commit set 'openshift_master_config_dir' to '/var/lib/origin' if undefined during upgrades. This commit sets value to the proper directory '/etc/origin'
* | | | | | | | | | Merge pull request #4509 from zgalor/prometheus-roleScott Dodson2017-09-0617-0/+1028
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Create ansible role for deploying prometheus on openshift
| * | | | | | | | | | Create ansible role for deploying prometheus on openshiftZohar Galor2017-09-0617-0/+1028
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A new role for installing prometheus on openshift. Depends on `openshift_hosted_prometheus_deploy` flag role creates: - prometheus namespace - prometheus clusterrolebinding and service account - pvs for prometheus, alertmanager and alertbuffer for internal nfs - prometheus pod with prometheus behind oauth-proxy, alertmanager and alert-buffer behind oauth-proxy - prometheus and alertmanager configmaps - prometheus and alerts services and direct routes - prometheus, alertmanager and alert-buffer pvcs
* | | | | | | | | | Merge pull request #5102 from ilackarms/fix-pv-templateScott Dodson2017-09-062-3/+7
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | only evaluate openshift_cfme_nfs_server if using nfs
| * | | | | | | | | skip openshift_cfme_nfs_server if not using nfsScott Weiss2017-09-032-3/+7
| | | | | | | | | |
* | | | | | | | | | Merge pull request #5277 from ingvagabund/update-env-in-etcd-confScott Dodson2017-09-061-3/+23
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | update env in etcd.conf.j2 to reflect the latest naming
| * | | | | | | | | | update env in etcd.conf.j2 to reflect the latest namingJan Chaloupka2017-08-311-3/+23
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #3536 from giuseppe/system-containers-skopeoOpenShift Bot2017-09-052-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | oc_atomic_container: support Skopeo outputGiuseppe Scrivano2017-03-022-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we are working on using Skopeo to copy images to the OSTree storage. The output from atomic will be slightly different. Support also the new version. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | | | | | | Merge pull request #5279 from kwoodson/repos_accept_name_or_idKenny Woodson2017-09-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | Adding another default to protect against missing name/desc
| * | | | | | | | | | Adding another default to protect against missing name/descKenny Woodson2017-08-311-1/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge pull request #5287 from mtnbikenc/deprecation-checksOpenShift Bot2017-09-021-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | Adding deprecation checks to ansible_syntaxRussell Teague2017-09-011-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #5261 from mgugino-upstream-stage/remove-dns-openshift-factsOpenShift Bot2017-09-019-170/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot
| * | | | | | | | | | Removed dns roleMichael Gugino2017-08-319-170/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit removes now-unused dns role.
* | | | | | | | | | | Merge pull request #5260 from ↵OpenShift Bot2017-09-014-18/+12
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mgugino-upstream-stage/remove-clock-from-openshift-facts Merged by openshift-bot
| * | | | | | | | | | Remove meta depends from clockMichael Gugino2017-08-294-18/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This role removes openshift_fact meta depends from clock role.
* | | | | | | | | | | Merge pull request #5168 from bacek/fix_glusterfs_firewallKenny Woodson2017-08-311-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | Fix typo in variable names for glusterfs firewall configuration