diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-12-09 14:38:40 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-12-09 14:38:40 -0500 |
| commit | b7b3e6dbdfd17e55055630ce963965818e830620 (patch) | |
| tree | 70eee046db8012061c178ab4e686650048265564 /playbooks/common | |
| parent | 6d0350f8249003acda2ed415d40aecfe9033ebe1 (diff) | |
| parent | dd17fd49597ec27f66ff9436f211036125dbb08f (diff) | |
| download | openshift-b7b3e6dbdfd17e55055630ce963965818e830620.tar.gz openshift-b7b3e6dbdfd17e55055630ce963965818e830620.tar.bz2 openshift-b7b3e6dbdfd17e55055630ce963965818e830620.tar.xz openshift-b7b3e6dbdfd17e55055630ce963965818e830620.zip | |
Merge pull request #1043 from abutcher/session_vars
Simplify session secrets overrides.
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index becd68dbe..196cdc8fe 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -249,22 +249,14 @@ - name: Generate session authentication key command: /usr/bin/openssl rand -base64 24 register: session_auth_output - with_sequence: count=1 when: openshift_master_session_auth_secrets is undefined - name: Generate session encryption key command: /usr/bin/openssl rand -base64 24 register: session_encryption_output - with_sequence: count=1 when: openshift_master_session_encryption_secrets is undefined - set_fact: - session_auth_secret: "{{ openshift_master_session_auth_secrets - | default(session_auth_output.results - | oo_collect(attribute='stdout') - | list) }}" - session_encryption_secret: "{{ openshift_master_session_encryption_secrets - | default(session_encryption_output.results - | oo_collect(attribute='stdout') - | list) }}" + session_auth_secret: "{{ openshift_master_session_auth_secrets | default([session_auth_output.stdout]) }}" + session_encryption_secret: "{{ openshift_master_session_encryption_secrets | default([session_encryption_output.stdout]) }}" - name: Parse named certificates hosts: localhost |