From 0b61ab55596415bd1b463f52a4110f46897d2352 Mon Sep 17 00:00:00 2001 From: Eric Mountain Date: Mon, 14 Dec 2015 10:35:35 +0100 Subject: Fixes typo when setting facts to record whether master/node has been restarted already, to decide whether notify handler should do so or not. Currently, this causes random SDN network setup failures as openshift-node gets restarted while the setup script is running, and the subsequent start fails to configure the SDN because it thinks it's already done. --- roles/openshift_node/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'roles/openshift_node/tasks') diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index eef7bec9a..f8711d15a 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -131,4 +131,4 @@ register: start_result - set_fact: - node_service_status_changed = start_result | changed + node_service_status_changed: start_result | changed -- cgit v1.2.3 From 072d4aacbe745cca7a768a60c13e65eba9d1fa48 Mon Sep 17 00:00:00 2001 From: Devan Goodwin Date: Tue, 15 Dec 2015 10:59:48 -0400 Subject: Fix registry modification for new deployment types. New deployment types were missed when installing with additional docker registries. --- roles/openshift_node/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'roles/openshift_node/tasks') diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index eef7bec9a..b6150a00c 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -85,11 +85,11 @@ docker_additional_registries: "{{ lookup('oo_option', 'docker_additional_registries') | oo_split() | union(['registry.access.redhat.com']) | difference(['']) }}" - when: openshift.common.deployment_type == 'enterprise' + when: openshift.common.deployment_type in ['enterprise', 'openshift-enterprise', 'atomic-enterprise'] - set_fact: docker_additional_registries: "{{ lookup('oo_option', 'docker_additional_registries') | oo_split() | difference(['']) }}" - when: openshift.common.deployment_type != 'enterprise' + when: openshift.common.deployment_type not in ['enterprise', 'openshift-enterprise', 'atomic-enterprise'] - name: Add personal registries lineinfile: -- cgit v1.2.3