diff options
author | Jason DeTiberus <jdetiber@redhat.com> | 2016-02-26 11:12:16 -0500 |
---|---|---|
committer | Jason DeTiberus <jdetiber@redhat.com> | 2016-03-14 11:38:13 -0400 |
commit | 1565bc6e71bdda712d4cfdbf28754f00b38a4674 (patch) | |
tree | 8e5774e28e5ea233f09ffdcc446b6f692ab0cf2f /playbooks/common/openshift-master | |
parent | a0e7f19f9f7f423d8fe001a247ccf2c98d815d68 (diff) | |
download | openshift-1565bc6e71bdda712d4cfdbf28754f00b38a4674.tar.gz openshift-1565bc6e71bdda712d4cfdbf28754f00b38a4674.tar.bz2 openshift-1565bc6e71bdda712d4cfdbf28754f00b38a4674.tar.xz openshift-1565bc6e71bdda712d4cfdbf28754f00b38a4674.zip |
Docker role refactor
- refactors the docker role to push generic config into docker role and wrap
openshift specific variables into an openshift_docker role and it's
dependent openshift_docker_facts role
- adds support for setting --confirm-def-push flag (Resolves
https://github.com/openshift/openshift-ansible/issues/1014)
- moves docker related facts from common/node roles to a new docker role
- renames cli_docker_* role varialbes to openshift_docker-* (maintaining
backward compatibility)
- update role dependencies to pull in openshift_docker conditionally based on
is_containerized
- remove playbooks/common/openshift-docker since the docker role is now
conditionally included
Diffstat (limited to 'playbooks/common/openshift-master')
-rw-r--r-- | playbooks/common/openshift-master/config.yml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index 3c7d94c96..8a51f6227 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -1,6 +1,9 @@ --- - name: Set master facts and determine if external etcd certs need to be generated hosts: oo_masters_to_config + vars: + t_oo_option_master_debug_level: "{{ lookup('oo_option', 'openshift_master_debug_level') }}" + pre_tasks: - name: Check for RPM generated config marker file .config_managed stat: @@ -30,9 +33,8 @@ | default(none, true) }}" - set_fact: - openshift_master_debug_level: "{{ lookup('oo_option', 'openshift_master_debug_level') | default(openshift.common.debug_level, true) }}" - when: openshift_master_debug_level is not defined - + openshift_master_debug_level: "{{ t_oo_option_master_debug_level }}" + when: openshift_master_debug_level is not defined and t_oo_option_master_debug_level != "" roles: - openshift_facts post_tasks: |