diff options
| author | Andrew Butcher <abutcher@afrolegs.com> | 2016-07-25 22:19:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-25 22:19:17 -0400 |
| commit | 4cc5781749e9f2eadde2707b07bb11c7552bd46f (patch) | |
| tree | 7c12984db9fcc013bb2a46b2e6abc371cd95eaca /playbooks/common | |
| parent | cd46274c9d52dab3553f3f88fca37bf2a93c9068 (diff) | |
| parent | 1c05e9e6933f11156fd893083e479113fdbdc23b (diff) | |
| download | openshift-4cc5781749e9f2eadde2707b07bb11c7552bd46f.tar.gz openshift-4cc5781749e9f2eadde2707b07bb11c7552bd46f.tar.bz2 openshift-4cc5781749e9f2eadde2707b07bb11c7552bd46f.tar.xz openshift-4cc5781749e9f2eadde2707b07bb11c7552bd46f.zip | |
Merge pull request #2216 from abutcher/fix-named-certs
Fix named certificate directory path.
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index 911c23d70..2f12b08c9 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -199,7 +199,7 @@ - name: Deploy named certificates hosts: oo_masters_to_config vars: - named_certs_dir: "{{ master_cert_config_dir }}/named_certificates/" + named_certs_dir: "{{ openshift.common.config_base }}/master/named_certificates/" named_certs_specified: "{{ openshift_master_named_certificates is defined }}" overwrite_named_certs: "{{ openshift_master_overwrite_named_certificates | default(false) }}" roles: @@ -224,11 +224,11 @@ when: named_certs_specified | bool - name: Land named certificates copy: src="{{ item.certfile }}" dest="{{ named_certs_dir }}" - with_items: openshift_master_named_certificates + with_items: "{{ openshift_master_named_certificates }}" when: named_certs_specified | bool - name: Land named certificate keys copy: src="{{ item.keyfile }}" dest="{{ named_certs_dir }}" mode=0600 - with_items: openshift_master_named_certificates + with_items: "{{ openshift_master_named_certificates }}" when: named_certs_specified | bool - name: Configure masters |