Browse Source

Remove /etc/os-net-config/config.json in os-apply-config

In the new style of nic config files, os-net-config is invoked by
the script run-os-net-config.sh, not by os-apply-config.  This is the
only format supported in Queens. Remove the os-apply-config version
of /etc/os-net-config/config.json to prevent os-apply-config from
attempting to run with an empty config.json file.

Note that /etc/os-net-config/config.json no longer exists in
tripleo-image-elements.

Change-Id: Ica86382c4e5a1463ed8b2146e3ec490b7e2c9452
Closes-Bug: 1758161
(cherry picked from commit 20e5f2766cf97c463fc73175ddcf31a1d7fb558d)
changes/97/556997/1
Bob Fournier 3 years ago
parent
commit
6f5d0b7155
1 changed files with 0 additions and 4 deletions
  1. +0
    -4
      heat_docker_agent/configure_container.sh

+ 0
- 4
heat_docker_agent/configure_container.sh View File

@ -98,10 +98,6 @@ mkdir -p /usr/libexec/os-refresh-config/post-configure.d
ln -sf /usr/share/tripleo-image-elements/os-refresh-config/os-refresh-config/post-configure.d/99-refresh-completed \
/usr/libexec/os-refresh-config/post-configure.d/
mkdir -p /usr/libexec/os-apply-config/templates/etc/os-net-config/
ln -sf /usr/share/tripleo-image-elements/os-net-config/os-apply-config/etc/os-net-config/config.json \
/usr/libexec/os-apply-config/templates/etc/os-net-config/
# Remove unnecessary packages
yum autoremove -y
yum clean all

Loading…
Cancel
Save