Comment 12 for bug 1840391

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to stx-puppet (master)

Reviewed: https://review.opendev.org/684173
Committed: https://git.openstack.org/cgit/starlingx/stx-puppet/commit/?id=295410ed3dfce8485ee1ef9fa70f635049d0c9c4
Submitter: Zuul
Branch: master

commit 295410ed3dfce8485ee1ef9fa70f635049d0c9c4
Author: Steven Webster <email address hidden>
Date: Tue Sep 17 10:06:36 2019 -0500

    Enable default CNI plugins

    Currently, only a subset of the default CNI plugins are enabled in
    StarlingX. These plugins are provided by Calico and placed in the
    /opt/cni/bin directory.

    On CentOS, the full set of CNI plugins that are distributed by the
    containernetworking-plugins package are installed under the
    default directory for system daemons and utilities at
    /usr/libexec/cni

    This means that some of the default plugins such as static ipam and
    dhcp are not available to be used, as kublet looks at the
    /opt/cni/bin directory by default.

    This commit changes the cni-bin volume of the Calico, Multus, and
    SRIOV CNI daemonsets to refer to the plugin executable path used by
    the containernetworking-plugins package. As such, it is also
    required that the --cni-bin-dir option now be passed to kubelet.

    In addition, since the config_controller --force option has been
    removed, we can safely remove the calico, multus, and SRIOV puppet
    templates. They have already been replaced by the equivalent
    ansible bootstrap templates.

    Depends-on: https://review.opendev.org/680409
    Change-Id: I5a21ccc7cb06ab8f50df19b513335cd4a16211f5
    Partial-Bug: #1840391
    Signed-off-by: Steven Webster <email address hidden>