magnum container_infra_prefix not being overriden when passed in cluster label

[Ricardo Rocha]

The value in the cluster template for container_infra_prefix is always taken, even if the label is passed on cluster creation.

The issue seems to be in the template definition:

grep -4 container_infra_prefix magnum/drivers/heat/k8s_fedora_template_def.py

        container_infra_prefix = cluster_template.labels.get(
            'container_infra_prefix')
        if container_infra_prefix:
            extra_params['container_infra_prefix'] = container_infra_prefix

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/529330

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/529330
Committed: https://git.openstack.org/cgit/openstack/magnum/commit/?id=00535708bfbc6497662bde2185b3f45e408152b2
Submitter: Zuul
Branch: master

commit 00535708bfbc6497662bde2185b3f45e408152b2
Author: Ricardo Rocha <email address hidden>
Date: Wed Dec 20 14:11:38 2017 +0000

    [k8s] Take container_infra_prefix from cluster if specified

    Fix the setting of container_infra_prefix on the template definition, we were
    taking the cluster template and ignoring cluster even if an explicit value
    was given.

    Change-Id: I658178c31080e4ea74d4e78fc1c76536d5aea73e
    Closes-Bug: #1739424

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/magnum 6.0.0 release.