diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-09-14 12:54:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-14 12:54:12 -0400 |
| commit | 992c0ce69460c616dde56dc3e21131945b5fe536 (patch) | |
| tree | b83cd23d40b72b887fc9e3f50ed64fe9e2a9374d | |
| parent | 872aafbe7a65388c473d125095ae60fc9ae915a4 (diff) | |
| parent | ed7d4dc694eb334421d7730e6002e2bd74f76ff7 (diff) | |
| download | openshift-992c0ce69460c616dde56dc3e21131945b5fe536.tar.gz openshift-992c0ce69460c616dde56dc3e21131945b5fe536.tar.bz2 openshift-992c0ce69460c616dde56dc3e21131945b5fe536.tar.xz openshift-992c0ce69460c616dde56dc3e21131945b5fe536.zip | |
Merge pull request #2450 from abutcher/issue2448
[redeploy-certificates] Correct etcd service name for containerized.
| -rw-r--r-- | playbooks/common/openshift-cluster/redeploy-certificates.yml | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/redeploy-certificates.yml b/playbooks/common/openshift-cluster/redeploy-certificates.yml index b97906072..5b72c3450 100644 --- a/playbooks/common/openshift-cluster/redeploy-certificates.yml +++ b/playbooks/common/openshift-cluster/redeploy-certificates.yml @@ -52,6 +52,14 @@ openshift_ca_host: "{{ groups.oo_first_master.0 }}" openshift_master_count: "{{ openshift.master.master_count | default(groups.oo_masters | length) }}" pre_tasks: + # set_fact task copied from playbooks/common/openshift-master/config.yml + # so that openshift_master_default_subdomain has a default value of "" + # (emptry string). openshift_master_default_subdomain must have a default + # value for openshift_master_facts to set metrics_public_url. + # TODO: clean this up. + - set_fact: + openshift_master_default_subdomain: "{{ lookup('oo_option', 'openshift_master_default_subdomain') | default(None, true) }}" + when: openshift_master_default_subdomain is not defined - stat: path: "{{ openshift_generated_configs_dir }}" register: openshift_generated_configs_dir_stat @@ -133,7 +141,9 @@ hosts: oo_etcd_to_config tasks: - name: restart etcd - service: name=etcd state=restarted + service: + name: "{{ 'etcd' if not openshift.common.is_containerized | bool else 'etcd_container' }}" + state: restarted - name: Stop master services hosts: oo_masters_to_config |