diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2015-12-01 09:43:10 -0400 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2015-12-01 09:43:10 -0400 |
| commit | b71c3247f1f762b7b99aa081cd9925ecfa4d31e7 (patch) | |
| tree | c86cce71d3691386451eb03390676a12f3c52f65 /playbooks/common/openshift-master | |
| parent | e796856c804cd7090ed45aba7838436e7fdc9580 (diff) | |
| parent | ebf659b0c1775f9be3e52a8ef420d568656c10f9 (diff) | |
| download | openshift-b71c3247f1f762b7b99aa081cd9925ecfa4d31e7.tar.gz openshift-b71c3247f1f762b7b99aa081cd9925ecfa4d31e7.tar.bz2 openshift-b71c3247f1f762b7b99aa081cd9925ecfa4d31e7.tar.xz openshift-b71c3247f1f762b7b99aa081cd9925ecfa4d31e7.zip | |
Merge branch 'master' into loadbalanced-2
Diffstat (limited to 'playbooks/common/openshift-master')
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index 902fde956..f382494bd 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -244,6 +244,8 @@ - fail: msg: "openshift_master_session_auth_secrets and openshift_master_encryption_secrets must be equal length" when: (openshift_master_session_auth_secrets is defined and openshift_master_session_encryption_secrets is defined) and (openshift_master_session_auth_secrets | length != openshift_master_session_encryption_secrets | length) + - name: Install OpenSSL package + action: "{{ansible_pkg_mgr}} pkg=openssl state=present" - name: Generate session authentication key command: /usr/bin/openssl rand -base64 24 register: session_auth_output @@ -351,11 +353,16 @@ - role: openshift_cluster_metrics when: openshift.common.use_cluster_metrics | bool + # TODO: Setting the cluster dns ip should be pushed into openshift-facts - name: Determine cluster dns ip hosts: oo_first_master tasks: - name: Get master service ip - command: "{{ openshift.common.client_binary }} get -o template svc kubernetes --template=\\{\\{.spec.clusterIP\\}\\}" + command: > + {{ openshift.common.client_binary }} -n default + --config={{ openshift.common.config_base }}/master/admin.kubeconfig + get -o template svc kubernetes --template=\\{\\{.spec.clusterIP\\}\\} + --output-version=v1 register: master_service_ip_output when: openshift.common.version_greater_than_3_1_or_1_1 | bool - set_fact: |