From f3861404a08ba3171d8798facc07440284465be9 Mon Sep 17 00:00:00 2001 From: Andrew Butcher Date: Tue, 26 Apr 2016 10:28:07 -0400 Subject: Access portal_net in common facts. --- playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml | 2 +- playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'playbooks/common') 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 db1d420ac..6f0af31b8 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,7 @@ 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.master.portal_net }}" + openshift_docker_hosted_registry_network: "{{ hostvars[groups.oo_first_master.0].openshift.common.portal_net }}" handlers: - include: ../../../../../roles/openshift_master/handlers/main.yml - include: ../../../../../roles/openshift_node/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 a28f7e9c1..a91727ecd 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 @@ -129,7 +129,7 @@ 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.master.portal_net }}" + openshift_docker_hosted_registry_network: "{{ hostvars[groups.oo_first_master.0].openshift.common.portal_net }}" tasks: - name: Verifying the correct commandline tools are available shell: grep {{ verify_upgrade_version }} {{ openshift.common.admin_binary}} -- cgit v1.2.3 From ca88d5ca2357d5342f4dbb357aa17b4164a2c18e Mon Sep 17 00:00:00 2001 From: Andrew Butcher Date: Tue, 26 Apr 2016 10:57:20 -0400 Subject: Apply openshift_common to all masters prior to creating certificates for portal_net. --- playbooks/common/openshift-master/config.yml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'playbooks/common') diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index 060b5aa0d..537de4f5c 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -50,6 +50,10 @@ when: openshift_hosted_metrics_resolution is not defined roles: - openshift_facts + # TODO: Remove openshift_common from this roles list once + # openshift_master_certificates uses delegate_to and is applied to + # all masters rather than just the first. + - openshift_common post_tasks: - openshift_facts: role: master -- cgit v1.2.3 From 927278059ae25e97ada2161903c571409c2bc151 Mon Sep 17 00:00:00 2001 From: Andrew Butcher Date: Tue, 26 Apr 2016 11:34:16 -0400 Subject: Move portal_net from openshift_common to openshift_facts. --- playbooks/common/openshift-master/config.yml | 4 ---- 1 file changed, 4 deletions(-) (limited to 'playbooks/common') diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index 537de4f5c..060b5aa0d 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -50,10 +50,6 @@ when: openshift_hosted_metrics_resolution is not defined roles: - openshift_facts - # TODO: Remove openshift_common from this roles list once - # openshift_master_certificates uses delegate_to and is applied to - # all masters rather than just the first. - - openshift_common post_tasks: - openshift_facts: role: master -- cgit v1.2.3