diff --git a/cluster/saltbase/salt/cni/init.sls b/cluster/saltbase/salt/cni/init.sls index 544f33f522b..e9da08dc61a 100644 --- a/cluster/saltbase/salt/cni/init.sls +++ b/cluster/saltbase/salt/cni/init.sls @@ -5,6 +5,13 @@ - mode: 755 - makedirs: True +/etc/cni/net.d: + file.directory: + - user: root + - group: root + - mode: 755 + - makedirs: True + # These are all available CNI network plugins. cni-tar: archive: @@ -18,3 +25,17 @@ cni-tar: - archive_format: tar - if_missing: /opt/cni/bin +{% if grains['cloud'] is defined and grains.cloud in [ 'vagrant' ] %} +# Install local CNI network plugins in a Vagrant environment +cmd-local-cni-plugins: + cmd.run: + - name: | + cp -v /vagrant/cluster/network-plugins/cni/bin/* /opt/cni/bin/. + chmod +x /opt/cni/bin/* +cmd-local-cni-config: + cmd.run: + - name: | + cp -v /vagrant/cluster/network-plugins/cni/config/* /etc/cni/net.d/. + chown root:root /etc/cni/net.d/* + chmod 744 /etc/cni/net.d/* +{% endif -%}