diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2016-02-11 15:45:52 -0500 |
|---|---|---|
| committer | Jason DeTiberus <jdetiber@redhat.com> | 2016-02-11 15:50:40 -0500 |
| commit | 81345f2ee5365708a3895f182645c42f2ee0efac (patch) | |
| tree | d7d23cf0c77ed21ca9e3ca71f5ba002b24b00d36 /roles/openshift_master/tasks/main.yml | |
| parent | 047c771ad882242774ceb971c02e82d1ca2cea15 (diff) | |
| download | openshift-81345f2ee5365708a3895f182645c42f2ee0efac.tar.gz openshift-81345f2ee5365708a3895f182645c42f2ee0efac.tar.bz2 openshift-81345f2ee5365708a3895f182645c42f2ee0efac.tar.xz openshift-81345f2ee5365708a3895f182645c42f2ee0efac.zip | |
conditionalize loopback config on v >= 3.2/1.2
Diffstat (limited to 'roles/openshift_master/tasks/main.yml')
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 3613808b6..4aede31f6 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -240,36 +240,8 @@ - restart master api - restart master controllers -- name: Test local loopback context - command: > - {{ openshift.common.client_binary }} config view - --config={{ openshift_master_loopback_config }} - changed_when: false - register: loopback_config - -- command: > - {{ openshift.common.client_binary }} config set-cluster - --certificate-authority={{ openshift_master_config_dir }}/ca.crt - --embed-certs=true --server={{ openshift.master.loopback_api_url }} - {{ openshift.master.loopback_cluster_name }} - --config={{ openshift_master_loopback_config }} - when: loopback_context_string not in loopback_config.stdout - register: set_loopback_cluster - -- command: > - {{ openshift.common.client_binary }} config set-context - --cluster={{ openshift.master.loopback_cluster_name }} - --namespace=default --user={{ openshift.master.loopback_user }} - {{ openshift.master.loopback_context_name }} - --config={{ openshift_master_loopback_config }} - when: set_loopback_cluster | changed - register: set_loopback_context - -- command: > - {{ openshift.common.client_binary }} config use-context {{ openshift.master.loopback_context_name }} - --config={{ openshift_master_loopback_config }} - when: set_loopback_context | changed - register: set_current_context +- include: set_loopback_context.yml + when: openshift.common.version_gte_3_2_or_1_2 - name: Start and enable master service: name={{ openshift.common.service_type }}-master enabled=yes state=started |