Merge "Drop k8s_fedora_ironic_v1 driver"

Author: Zuul

devstack/lib/magnum

@@ -296,12 +296,6 @@ function magnum_register_image {
     if [ ! -z "$fedora_coreos" ]; then
         magnum_image_property=$magnum_image_property"fedora-coreos"
     fi
-    # os_distro property for fedora ironic image
-    local fedora_ironic="$(echo $MAGNUM_GUEST_IMAGE_URL | grep -i "ironic" \
-                                                        | grep -io "fedora" || true;)"
-    if [ ! -z "$fedora_ironic" ]; then
-        magnum_image_property=$magnum_image_property"fedora"
-    fi
 
     # get the image name
     local image_filename=$(basename "$MAGNUM_GUEST_IMAGE_URL")

doc/source/user/index.rst

@@ -2733,17 +2733,6 @@ The following software are managed as systemd services:
 
 The login user for this image is *core*.
 
-Kubernetes on Ironic
---------------------
-
-This image is built manually using diskimagebuilder. The scripts and
-instructions are included in `Magnum code repo
-<https://opendev.org/openstack/magnum/src/branch/master/magnum/drivers/k8s_fedora_ironic_v1/image/kubernetes>`_.
-Currently Ironic is not fully supported yet, therefore more details will be
-provided when this driver has been fully tested.
-
-
-
 Notification
 ============
 

magnum/api/controllers/v1/cluster_template.py

@@ -271,10 +271,6 @@ class ClusterTemplatesController(base.Controller):
         "driver. Please migrate to the fedora_coreos driver. fedora_atomic "
         "driver will be removed in a future Magnum version.")
 
-    _fedora_ironic_deprecation_note = (
-        "The fedora ironic driver is deprecated. "
-        "The driver will be removed in a future Magnum version.")
-
     def _generate_name_for_cluster_template(self, context):
         """Generate a random name like: zeta-22-model."""
 
@@ -441,13 +437,6 @@ def post(self, cluster_template):
                           DeprecationWarning)
             LOG.warning(self._coreos_deprecation_note)
 
-        if (cluster_template_dict['coe'] == 'kubernetes' and
-                cluster_template_dict['cluster_distro'] == 'fedora' and
-                cluster_template_dict['server_type'] == 'bm'):
-            warnings.warn(self._fedora_ironic_deprecation_note,
-                          DeprecationWarning)
-            LOG.warning(self._fedora_ironic_deprecation_note)
-
         # NOTE(yuywz): We will generate a random human-readable name for
         # cluster_template if the name is not specified by user.
         arg_name = cluster_template_dict.get('name')