From 84fbacbb0554fcfe425dffd88c83fab96c8c9c2b Mon Sep 17 00:00:00 2001 From: Devan Goodwin Date: Wed, 11 May 2016 10:55:17 -0300 Subject: Fixes for openshift_docker_hosted_registry_insecure var. Fixes a failure on masters if you explicitly set openshift_docker_hosted_registry_insecure=true. This is the default but if you tried to set it an error would trigger as a relevant variable was not passed in the master playbooks. Fixes setting the variable to false being ignored. master/node playbooks were referencing the docker fact, which was not set at that point and thus we were always getting the default of true, regardless what was in your inventory. Stop passing registry insecure in via playbooks, we can access it when running openshift_facts itself. Add a new default in openshift facts. --- playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml | 1 - playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'playbooks/common/openshift-cluster/upgrades') diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml index 1dd47dc15..02d9e3332 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml @@ -100,7 +100,6 @@ hosts: oo_masters_to_config:oo_nodes_to_config vars: target_version: "{{ '1.2' if deployment_type == 'origin' else '3.1.1.900' }}" - openshift_docker_hosted_registry_insecure: True openshift_docker_hosted_registry_network: "{{ hostvars[groups.oo_first_master.0].openshift.common.portal_net }}" handlers: - include: ../../../../../roles/openshift_master/handlers/main.yml diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml index a91727ecd..3d8e43f08 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml @@ -27,6 +27,8 @@ hosts: oo_masters_to_config:oo_nodes_to_config roles: - { role: openshift_docker_facts } + vars: + openshift_docker_hosted_registry_network: "{{ hostvars[groups.oo_first_master.0].openshift.common.portal_net }}" tasks: - name: Pull Images command: > @@ -128,7 +130,6 @@ vars: origin_reconcile_bindings: "{{ deployment_type == 'origin' and g_new_version | version_compare('1.0.6', '>') }}" ent_reconcile_bindings: true - openshift_docker_hosted_registry_insecure: True openshift_docker_hosted_registry_network: "{{ hostvars[groups.oo_first_master.0].openshift.common.portal_net }}" tasks: - name: Verifying the correct commandline tools are available -- cgit v1.2.3