diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-10-27 10:07:20 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-10-27 10:07:20 -0400 |
| commit | fcbb48362afb6e9ed196d7833940877bbc0296ae (patch) | |
| tree | d0bce8760facae32438342007cb568afcf27e3ad /playbooks | |
| parent | 2f02c464904551e8018e0afc47bcde850ed8d0f1 (diff) | |
| parent | 05458ecde01c9c1ade9d1a5216bc7621a92b9d6f (diff) | |
| download | openshift-fcbb48362afb6e9ed196d7833940877bbc0296ae.tar.gz openshift-fcbb48362afb6e9ed196d7833940877bbc0296ae.tar.bz2 openshift-fcbb48362afb6e9ed196d7833940877bbc0296ae.tar.xz openshift-fcbb48362afb6e9ed196d7833940877bbc0296ae.zip | |
Merge pull request #731 from abutcher/proxy-client-config
Add proxy client certs to master config
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/adhoc/upgrades/upgrade.yml | 10 | ||||
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 7 |
2 files changed, 15 insertions, 2 deletions
diff --git a/playbooks/adhoc/upgrades/upgrade.yml b/playbooks/adhoc/upgrades/upgrade.yml index 56a1df860..ae1d0127c 100644 --- a/playbooks/adhoc/upgrades/upgrade.yml +++ b/playbooks/adhoc/upgrades/upgrade.yml @@ -1,4 +1,14 @@ --- +- name: Upgrade base package on masters + hosts: masters + roles: + - openshift_facts + vars: + openshift_version: "{{ openshift_pkg_version | default('') }}" + tasks: + - name: Upgrade base package + yum: pkg={{ openshift.common.service_type }}{{ openshift_version }} state=latest + - name: Re-Run cluster configuration to apply latest configuration changes include: ../../common/openshift-cluster/config.yml vars: diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index 0a3fe90e1..1dec923fc 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -137,6 +137,7 @@ openshift_master_certs_no_etcd: - admin.crt - master.kubelet-client.crt + - "{{ 'master.proxy-client.crt' if openshift.common.version_greater_than_3_1_or_1_1 else omit }}" - master.server.crt - openshift-master.crt - openshift-registry.crt @@ -144,6 +145,7 @@ - etcd.server.crt openshift_master_certs_etcd: - master.etcd-client.crt + - set_fact: openshift_master_certs: "{{ (openshift_master_certs_no_etcd | union(openshift_master_certs_etcd)) if (groups.oo_etcd_to_config is defined and groups.oo_etcd_to_config) else openshift_master_certs_no_etcd }}" @@ -153,9 +155,9 @@ with_items: openshift_master_certs register: g_master_cert_stat_result - set_fact: - master_certs_missing: "{{ g_master_cert_stat_result.results + master_certs_missing: "{{ False in (g_master_cert_stat_result.results | map(attribute='stat.exists') - | list | intersect([false])}}" + | list ) }}" master_cert_subdir: master-{{ openshift.common.hostname }} master_cert_config_dir: "{{ openshift.common.config_base }}/master" @@ -187,6 +189,7 @@ args: creates: "{{ master_generated_certs_dir }}/{{ item.master_cert_subdir }}.tgz" with_items: masters_needing_certs + - name: Retrieve the master cert tarball from the master fetch: src: "{{ master_generated_certs_dir }}/{{ item.master_cert_subdir }}.tgz" |