From b3a61a114f58e379a3352128f390cca45a3306d4 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Thu, 1 Oct 2020 07:52:47 +0000 Subject: [PATCH] Revert "CI: workaround overcloud upgrade issue with ironic" This reverts commit bb9a595e5ea16b5ad6500fc57cbee3f1d4035ab1. Change-Id: Icd7b0f3b02bf3f22468daa8893c043ac9f3be4d6 --- playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2 | 7 ------- 1 file changed, 7 deletions(-) diff --git a/playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2 b/playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2 index 0e169a24c..9fec45fdd 100644 --- a/playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2 +++ b/playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2 @@ -26,10 +26,3 @@ pip_index_url: "http://{{ zuul_site_mirror_fqdn }}/pypi/simple" # are using for SSH to be removed. Use a dummy interface. aio_bridge_ports: - dummy1 - -# FIXME(mgoddard): Ironic has an issue where nodes will be switched to use the -# direct deploy interface during upgrade, if it is enabled. This should be -# fixed via https://review.opendev.org/755295, after which this configuration -# may be removed. -kolla_ironic_enabled_deploy_interfaces: - - iscsi