diff options
author | Jason DeTiberus <jdetiber@redhat.com> | 2015-10-21 13:41:56 -0400 |
---|---|---|
committer | Jason DeTiberus <jdetiber@redhat.com> | 2015-10-22 11:15:57 -0400 |
commit | 3e44d3aa6d35c62c57c102f5a8fec4bf86d2a1b5 (patch) | |
tree | 05cb62765b16528e22db42afa52ead62a5919b0a /roles/openshift_master | |
parent | 917f8b157b10ee605cee75065fe874c5561a0573 (diff) | |
download | openshift-3e44d3aa6d35c62c57c102f5a8fec4bf86d2a1b5.tar.gz openshift-3e44d3aa6d35c62c57c102f5a8fec4bf86d2a1b5.tar.bz2 openshift-3e44d3aa6d35c62c57c102f5a8fec4bf86d2a1b5.tar.xz openshift-3e44d3aa6d35c62c57c102f5a8fec4bf86d2a1b5.zip |
Fix test and workaround for rpm generated configs
- fixed inconcistency in naming for rpm generated config test
- refactoring to fix logic after the ha master refactoring had broken the
previous steps
Diffstat (limited to 'roles/openshift_master')
-rw-r--r-- | roles/openshift_master/tasks/main.yml | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 4dcab31d1..a5c1a805c 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -62,20 +62,6 @@ yum: pkg={{ openshift.common.service_type }}-master{{ openshift_version }} state=present register: install_result -- name: Check for RPM generated config marker file /etc/origin/.config_managed - stat: path=/etc/origin/.rpmgenerated - register: rpmgenerated_config - -- name: Remove RPM generated config files - file: - path: "{{ item }}" - state: absent - when: openshift.common.service_type in ['atomic-enterprise','openshift-enterprise'] and rpmgenerated_config.stat.exists == true - with_items: - - "{{ openshift.common.config_base }}/master" - - "{{ openshift.common.config_base }}/node" - - "{{ openshift.common.config_base }}/.rpmgenerated" - # TODO: These values need to be configurable - name: Set dns facts openshift_facts: |