diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2017-05-23 15:50:32 -0400 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2017-06-02 16:42:14 -0400 |
| commit | 816e92aca20a8882016416f3ed4244e5e48d56e7 (patch) | |
| tree | 0294d5fae2f7f5d97f402d995a09609f59bf9b4c /roles/openshift_ca | |
| parent | c1822d03c672dcea889b5ef9263fea54ddf7ce1c (diff) | |
| download | openshift-816e92aca20a8882016416f3ed4244e5e48d56e7.tar.gz openshift-816e92aca20a8882016416f3ed4244e5e48d56e7.tar.bz2 openshift-816e92aca20a8882016416f3ed4244e5e48d56e7.tar.xz openshift-816e92aca20a8882016416f3ed4244e5e48d56e7.zip | |
Use local openshift.master.loopback_url when generating initial master loopback kubeconfigs.
Diffstat (limited to 'roles/openshift_ca')
| -rw-r--r-- | roles/openshift_ca/tasks/main.yml | 32 | ||||
| -rw-r--r-- | roles/openshift_ca/vars/main.yml | 3 |
2 files changed, 35 insertions, 0 deletions
diff --git a/roles/openshift_ca/tasks/main.yml b/roles/openshift_ca/tasks/main.yml index c7b906949..b9a7ec32f 100644 --- a/roles/openshift_ca/tasks/main.yml +++ b/roles/openshift_ca/tasks/main.yml @@ -108,6 +108,38 @@ delegate_to: "{{ openshift_ca_host }}" run_once: true +- name: Test local loopback context + command: > + {{ hostvars[openshift_ca_host].openshift.common.client_binary }} config view + --config={{ openshift_master_loopback_config }} + changed_when: false + register: loopback_config + delegate_to: "{{ openshift_ca_host }}" + run_once: true + +- name: Generate the loopback master client config + command: > + {{ hostvars[openshift_ca_host].openshift.common.client_binary }} adm create-api-client-config + {% for named_ca_certificate in openshift.master.named_certificates | default([]) | oo_collect('cafile') %} + --certificate-authority {{ named_ca_certificate }} + {% endfor %} + --certificate-authority={{ openshift_ca_cert }} + --client-dir={{ openshift_ca_config_dir }} + --groups=system:masters,system:openshift-master + --master={{ hostvars[openshift_ca_host].openshift.master.loopback_api_url }} + --public-master={{ hostvars[openshift_ca_host].openshift.master.loopback_api_url }} + --signer-cert={{ openshift_ca_cert }} + --signer-key={{ openshift_ca_key }} + --signer-serial={{ openshift_ca_serial }} + --user=system:openshift-master + --basename=openshift-master + {% if openshift_version | oo_version_gte_3_5_or_1_5(openshift.common.deployment_type) | bool %} + --expire-days={{ openshift_master_cert_expire_days }} + {% endif %} + when: loopback_context_string not in loopback_config.stdout + delegate_to: "{{ openshift_ca_host }}" + run_once: true + - name: Restore original serviceaccount keys copy: src: "{{ item }}.keep" diff --git a/roles/openshift_ca/vars/main.yml b/roles/openshift_ca/vars/main.yml index a32e385ec..d04c1766d 100644 --- a/roles/openshift_ca/vars/main.yml +++ b/roles/openshift_ca/vars/main.yml @@ -4,3 +4,6 @@ openshift_ca_cert: "{{ openshift_ca_config_dir }}/ca.crt" openshift_ca_key: "{{ openshift_ca_config_dir }}/ca.key" openshift_ca_serial: "{{ openshift_ca_config_dir }}/ca.serial.txt" openshift_version: "{{ openshift_pkg_version | default('') }}" + +openshift_master_loopback_config: "{{ openshift_ca_config_dir }}/openshift-master.kubeconfig" +loopback_context_string: "current-context: {{ openshift.master.loopback_context_name }}" |