Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Fix syntax error caused by an extra paren" | Tomas Sedovic | 2017-12-01 | 1 | -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 Sedovic | 2017-12-01 | 1 | -4/+4 |
| | | | | | | The rhel_subscribe role fixes will be done in a separate pull request. This reverts commit 691179281336dcd56d17b70cdf4067a142238b83. | ||||
* | Fix the env lookup fallback in rhel_subscribe | Tomas Sedovic | 2017-11-29 | 1 | -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. | ||||
* | Fix syntax error caused by an extra paren | Tomas Sedovic | 2017-11-29 | 1 | -1/+1 |
| | |||||
* | Merge pull request #6301 from mgugino-upstream-stage/project_cfg_facts | OpenShift Merge Robot | 2017-11-28 | 4 | -41/+12 |
|\ | | | | | | | | | Automatic merge from submit-queue. Remove openshift_facts project_cfg_facts | ||||
| * | Remove openshift_facts project_cfg_facts | Michael Gugino | 2017-11-28 | 4 | -41/+12 |
| | | | | | | | | This simplifies some variable logic. | ||||
* | | Merge pull request #6073 from mjudeikis/fix_glusterfs_restart | Scott Dodson | 2017-11-28 | 1 | -0/+10 |
|\ \ | |/ |/| | fix for Gluster force restart | ||||
| * | Add check for gluterFS DS to stop restarts | Mangirdas | 2017-11-19 | 1 | -0/+10 |
| | | |||||
* | | Remove dns_port fact | Michael Gugino | 2017-11-28 | 4 | -21/+5 |
| | | | | | | | | Simply dns_port variable by remove from openshift_facts. | ||||
* | | Merge pull request #6295 from mtnbikenc/remove-etcd-file | Russell Teague | 2017-11-28 | 1 | -8/+0 |
|\ \ | | | | | | | Remove unused task file from etcd role | ||||
| * | | Remove unused task file from etcd role | Russell Teague | 2017-11-28 | 1 | -8/+0 |
| | | | |||||
* | | | Merge pull request #6269 from mgugino-upstream-stage/clock-depends | Michael Gugino | 2017-11-28 | 2 | -3/+0 |
|\ \ \ | | | | | | | | | Remove openshift_clock from meta depends | ||||
| * | | | Remove openshift_clock from meta depends | Michael Gugino | 2017-11-27 | 2 | -3/+0 |
| | | | | | | | | | | | | | | | | | | | | This commit adds openshift_clock role to required plays instead of using meta_depends. | ||||
* | | | | Merge pull request #6268 from mgugino-upstream-stage/combine-dnsmasq-with-node | Michael Gugino | 2017-11-28 | 15 | -65/+23 |
|\ \ \ \ | | | | | | | | | | | Combine openshift_node and openshift_node_dnsmasq | ||||
| * | | | | Combine openshift_node and openshift_node_dnsmasq | Michael Gugino | 2017-11-27 | 15 | -65/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This commit combines these two roles. This will prevent openshift_node_facts from running twice. | ||||
* | | | | | Merge pull request #6283 from mgugino-upstream-stage/schedulable | Michael Gugino | 2017-11-28 | 4 | -21/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | remove schedulable from openshift_facts | ||||
| * | | | | | remove schedulable from openshift_facts | Michael Gugino | 2017-11-27 | 4 | -21/+7 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | This commit removes schedulable from openshift_facts in favor of detecting whether or not a host is a master via inventory. | ||||
* | | | | | Merge pull request #6259 from adelton/issue-6255 | Michael Gugino | 2017-11-28 | 32 | -43/+43 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | dist.iteritems() no longer exists in Python 3. | ||||
| * | | | | dist.iteritems() no longer exists in Python 3. | Jan Pazdziora | 2017-11-27 | 32 | -43/+43 |
| | | | | | |||||
* | | | | | Merge pull request #6280 from mgugino-upstream-stage/cli_image | Scott Dodson | 2017-11-28 | 4 | -10/+12 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove openshift.common.cli_image | ||||
| * | | | | | Remove openshift.common.cli_image | Michael Gugino | 2017-11-27 | 4 | -10/+12 |
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | This commit removes openshift.common.cli_image in favor of openshift_cli_image. | ||||
* | | | | | Merge pull request #6287 from zgalor/prom-version-update | Scott Dodson | 2017-11-28 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Update prometheus to 2.0.0 GA | ||||
| * | | | | | Update prometheus to 2.0.0 GA | Zohar Galor | 2017-11-28 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | fix type in authroize | Jan Chaloupka | 2017-11-28 | 1 | -2/+2 |
|/ / / / / | |||||
* | | | | | Merge pull request #6272 from abutcher/fix-env-facts | Scott Dodson | 2017-11-27 | 1 | -6/+19 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix openshift_env fact creation within openshift_facts. | ||||
| * | | | | | Fix openshift_env fact creation within openshift_facts. | Andrew Butcher | 2017-11-27 | 1 | -6/+19 |
| | | | | | | |||||
* | | | | | | Merge pull request #6240 from ↵ | Russell Teague | 2017-11-27 | 5 | -10/+10 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | mtnbikenc/include-deprecation-openshift-service-catalog Include Deprecation - openshift-service-catalog | ||||
| * | | | | | Include Deprecation - openshift-service-catalog | Russell Teague | 2017-11-22 | 5 | -10/+10 |
| | | | | | | |||||
* | | | | | | GlusterFS: Remove extraneous line from glusterblock template | Jose A. Rivera | 2017-11-27 | 2 | -2/+0 |
| |/ / / / |/| | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com> | ||||
* | | | | | Merge pull request #6199 from mgugino-upstream-stage/master_sys_container | Michael Gugino | 2017-11-27 | 3 | -5/+7 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Simplify is_master_system_container logic | ||||
| * | | | | Simplify is_master_system_container logic | Michael Gugino | 2017-11-27 | 3 | -5/+7 |
| | | | | | | | | | | | | | | | | | | | | Simplify the variable is_master_system_container | ||||
* | | | | | Merge pull request #6143 from dabelenda/add_hostname_routes | Michael Gugino | 2017-11-27 | 3 | -0/+11 |
|\ \ \ \ \ | | | | | | | | | | | | | Allow to set the hostname for routes to prometheus and alertmanager | ||||
| * | | | | | Remove spurrious file committed by error | Diego Abelenda | 2017-11-24 | 1 | -15/+0 |
| | | | | | | |||||
| * | | | | | Fix name of the service pointed to by hostname | Diego Abelenda | 2017-11-24 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Missed the default value after the variable name change... | Diego Abelenda | 2017-11-24 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Change the name of the variable and explicitely document the names | Diego Abelenda | 2017-11-24 | 3 | -2/+19 |
| | | | | | | |||||
| * | | | | | Allow to set the hostname for routes to prometheus and alertmanager | Diego Abelenda | 2017-11-24 | 3 | -0/+9 |
| | | | | | | |||||
* | | | | | | Merge pull request #6185 from ↵ | Michael Gugino | 2017-11-27 | 1 | -6/+0 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | giuseppe/fix-additional-and-insecure-registries-for-crio cri-o: honor additional and insecure registries again | ||||
| * | | | | | | cri-o: honor additional and insecure registries again | Giuseppe Scrivano | 2017-11-20 | 1 | -6/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression introduced with: https://github.com/openshift/openshift-ansible/commit/ee6adf9e9a520cc5873bf9f36924ae9aa4c47c7c Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> | ||||
* | | | | | | | Merge pull request #6178 from giuseppe/copy-docker-to-alt-storage-path | Michael Gugino | 2017-11-27 | 1 | -4/+5 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | docker: copy Docker metadata to the alternative storage path | ||||
| * | | | | | | docker: copy Docker metadata to the alternative storage path | Giuseppe Scrivano | 2017-11-20 | 1 | -4/+5 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> | ||||
* | | | | | | Merge pull request #6198 from mgugino-upstream-stage/openvswitch-sys-container | Michael Gugino | 2017-11-27 | 2 | -2/+3 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Remove is_openvswitch_system_container from facts | ||||
| * | | | | | Remove is_openvswitch_system_container from facts | Michael Gugino | 2017-11-22 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | Simply logic for this variable. | ||||
* | | | | | | Merge pull request #6227 from adelton/issue-5517 | Scott Dodson | 2017-11-24 | 1 | -2/+3 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Workaround the fact that package state=present with dnf fails for already installed but excluded packages. | ||||
| * | | | | | Workaround the fact that package state=present with dnf fails for already ↵ | Jan Pazdziora | 2017-11-22 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | installed but excluded packages. | ||||
| * | | | | | With dnf repoquery and excluded packages, --disableexcludes=all is needed to ↵ | Jan Pazdziora | 2017-11-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | list the package with --installed. | ||||
* | | | | | | Merge pull request #6231 from mtnbikenc/include-deprecation-openshift-master | Russell Teague | 2017-11-22 | 8 | -25/+22 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Include Deprecation - openshift-master | ||||
| * | | | | | | Include Deprecation - openshift-master | Russell Teague | 2017-11-22 | 19 | -52/+49 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #6234 from mtnbikenc/include-deprecation-openshift-node | Russell Teague | 2017-11-22 | 20 | -64/+60 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | Include Deprecation - openshift-node | ||||
| * | | | | | | Include Deprecation - openshift-node | Russell Teague | 2017-11-22 | 20 | -64/+60 |
| | |_|/ / / | |/| | | | |