Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #6221 from mtnbikenc/consolidate-openshift-service-catalog | Russell Teague | 2017-11-22 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Playbook Consolidation - openshift-service-catalog | ||||
| * | | | | | Playbook Consolidation - openshift-service-catalog | Russell Teague | 2017-11-22 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #6236 from mtnbikenc/consolidate-openshift-provisioners | Russell Teague | 2017-11-22 | 4 | -10/+10 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Playbook Consolidation - openshift-provisioners | ||||
| * | | | | | | Playbook Consolidation - openshift-provisioners | Russell Teague | 2017-11-22 | 4 | -10/+10 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #6235 from mtnbikenc/include-deprecation-openshift-prometheus | Russell Teague | 2017-11-22 | 1 | -2/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Include Deprecation - openshift-prometheus | ||||
| * | | | | | | Include Deprecation - openshift-prometheus | Russell Teague | 2017-11-22 | 1 | -2/+2 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #6090 from dustymabe/dusty | Michael Gugino | 2017-11-22 | 1 | -9/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | hosted_registry: clean up tmp mount point and fstab | ||||
| * | | | | | hosted_registry: clean up tmp mount point and fstab | Dusty Mabe | 2017-11-10 | 1 | -9/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #6004 | ||||
* | | | | | | Merge pull request #6225 from mtnbikenc/include-deprecation-openshift-etcd | Russell Teague | 2017-11-22 | 32 | -47/+46 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Include Deprecation - openshift-etcd | ||||
| * | | | | | | Include Deprecation - openshift-etcd | Russell Teague | 2017-11-22 | 33 | -49/+48 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #6228 from mtnbikenc/include-deprecation-openshift-nfs | Russell Teague | 2017-11-22 | 1 | -2/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Include Deprecation - openshift-nfs | ||||
| * | | | | | | | Include Deprecation - openshift-nfs | Russell Teague | 2017-11-22 | 2 | -4/+3 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #6226 from mtnbikenc/include-deprecation-openshift-metrics | Russell Teague | 2017-11-22 | 7 | -21/+21 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Include Deprecation - openshift-metrics |