From f3b7f5eb6b79af0caee5063b636e87515bcd720c Mon Sep 17 00:00:00 2001 From: Andrew Butcher Date: Wed, 14 Sep 2016 11:14:53 -0400 Subject: [redeploy-certificates] Correct etcd service name. --- playbooks/common/openshift-cluster/redeploy-certificates.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/playbooks/common/openshift-cluster/redeploy-certificates.yml b/playbooks/common/openshift-cluster/redeploy-certificates.yml index b97906072..46b461770 100644 --- a/playbooks/common/openshift-cluster/redeploy-certificates.yml +++ b/playbooks/common/openshift-cluster/redeploy-certificates.yml @@ -133,7 +133,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 -- cgit v1.2.3 From ed7d4dc694eb334421d7730e6002e2bd74f76ff7 Mon Sep 17 00:00:00 2001 From: Andrew Butcher Date: Wed, 14 Sep 2016 12:41:08 -0400 Subject: [redeploy-certificates] Set default value for openshift_master_default_subdomain as workaround. --- playbooks/common/openshift-cluster/redeploy-certificates.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/playbooks/common/openshift-cluster/redeploy-certificates.yml b/playbooks/common/openshift-cluster/redeploy-certificates.yml index 46b461770..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 -- cgit v1.2.3