diff options
| author | Jan Chaloupka <jchaloup@redhat.com> | 2017-05-12 16:07:34 +0200 |
|---|---|---|
| committer | Jan Chaloupka <jchaloup@redhat.com> | 2017-05-18 12:33:16 +0200 |
| commit | 4fcbe72aeaf359d56ac636a8722f817ec10c629f (patch) | |
| tree | 93436888a90064b447d60cfa7f365100b81af823 /playbooks/common/openshift-cluster/redeploy-certificates | |
| parent | f186712088f8e14d7f90a010d0f2cb250e24ee42 (diff) | |
| download | openshift-4fcbe72aeaf359d56ac636a8722f817ec10c629f.tar.gz openshift-4fcbe72aeaf359d56ac636a8722f817ec10c629f.tar.bz2 openshift-4fcbe72aeaf359d56ac636a8722f817ec10c629f.tar.xz openshift-4fcbe72aeaf359d56ac636a8722f817ec10c629f.zip | |
move etcd upgrade related code into etcd_upgrade role
Diffstat (limited to 'playbooks/common/openshift-cluster/redeploy-certificates')
| -rw-r--r-- | playbooks/common/openshift-cluster/redeploy-certificates/ca.yml | 9 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/redeploy-certificates/etcd.yml | 8 |
2 files changed, 12 insertions, 5 deletions
diff --git a/playbooks/common/openshift-cluster/redeploy-certificates/ca.yml b/playbooks/common/openshift-cluster/redeploy-certificates/ca.yml index 4fa7f9cdf..0d0ff798c 100644 --- a/playbooks/common/openshift-cluster/redeploy-certificates/ca.yml +++ b/playbooks/common/openshift-cluster/redeploy-certificates/ca.yml @@ -9,7 +9,8 @@ - name: Backup existing etcd CA certificate directories hosts: oo_etcd_to_config roles: - - etcd_common + - role: etcd_common + r_etcd_common_etcd_runtime: "{{ openshift.common.etcd_runtime }}" tasks: - name: Determine if CA certificate directory exists stat: @@ -52,7 +53,8 @@ vars: etcd_ca_host: "{{ groups.oo_etcd_to_config.0 }}" roles: - - etcd_common + - role: etcd_common + r_etcd_common_etcd_runtime: "{{ openshift.common.etcd_runtime }}" tasks: - name: Create a tarball of the etcd ca certs command: > @@ -98,7 +100,8 @@ - name: Retrieve etcd CA certificate hosts: oo_first_etcd roles: - - etcd_common + - role: etcd_common + r_etcd_common_etcd_runtime: "{{ openshift.common.etcd_runtime }}" tasks: - name: Retrieve etcd CA certificate fetch: diff --git a/playbooks/common/openshift-cluster/redeploy-certificates/etcd.yml b/playbooks/common/openshift-cluster/redeploy-certificates/etcd.yml index 2963a5940..6b5c805e6 100644 --- a/playbooks/common/openshift-cluster/redeploy-certificates/etcd.yml +++ b/playbooks/common/openshift-cluster/redeploy-certificates/etcd.yml @@ -3,7 +3,8 @@ hosts: oo_first_etcd any_errors_fatal: true roles: - - etcd_common + - role: etcd_common + r_etcd_common_etcd_runtime: "{{ openshift.common.etcd_runtime }}" post_tasks: - name: Determine if generated etcd certificates exist stat: @@ -27,7 +28,8 @@ hosts: oo_etcd_to_config any_errors_fatal: true roles: - - etcd_common + - role: etcd_common + r_etcd_common_etcd_runtime: "{{ openshift.common.etcd_runtime }}" post_tasks: - name: Backup etcd certificates command: > @@ -50,6 +52,7 @@ etcd_peers: "{{ groups.oo_etcd_to_config | default([], true) }}" etcd_certificates_etcd_hosts: "{{ groups.oo_etcd_to_config | default([], true) }}" openshift_ca_host: "{{ groups.oo_first_master.0 }}" + r_etcd_common_etcd_runtime: "{{ openshift.common.etcd_runtime }}" - name: Redeploy etcd client certificates for masters hosts: oo_masters_to_config @@ -63,4 +66,5 @@ etcd_cert_prefix: "master.etcd-" openshift_ca_host: "{{ groups.oo_first_master.0 }}" openshift_master_count: "{{ openshift.master.master_count | default(groups.oo_masters | length) }}" + r_etcd_common_etcd_runtime: "{{ openshift.common.etcd_runtime }}" when: groups.oo_etcd_to_config is defined and groups.oo_etcd_to_config |