diff options
| author | Zuul <zuul@review.opendev.org> | 2025-08-07 09:31:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-08-07 09:31:13 +0000 |
| commit | 8dbb71b70ce32b86c3a220439739f522605251f8 (patch) | |
| tree | 12337c0ea3c0d705bee5609760785ce90ba686fb | |
| parent | 9782b68982bc816df191801ad4e79d30abcb1738 (diff) | |
| parent | 63c4202d207b6b4686156bca81c84ca756513f3c (diff) | |
| download | kolla-8dbb71b70ce32b86c3a220439739f522605251f8.tar.gz kolla-8dbb71b70ce32b86c3a220439739f522605251f8.zip | |
Merge "ironic: Stop copying rootwrap since Ironic dropped it"
| -rw-r--r-- | docker/ironic/ironic-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/ironic/ironic-base/ironic_sudoers | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/docker/ironic/ironic-base/Dockerfile.j2 b/docker/ironic/ironic-base/Dockerfile.j2 index 2002438c0..86f1d7014 100644 --- a/docker/ironic/ironic-base/Dockerfile.j2 +++ b/docker/ironic/ironic-base/Dockerfile.j2 @@ -21,9 +21,7 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN ln -s ironic-base-source/* ironic \ && {{ macros.install_pip(ironic_base_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/ironic \ - && cp -r /var/lib/kolla/venv/etc/ironic/* /etc/ironic/ \ && cp /var/lib/kolla/venv/etc/pycadf/ironic_api_audit_map.conf /etc/ironic/ \ - && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/ironic/rootwrap.conf \ && chmod 750 /etc/sudoers.d \ && chmod 440 /etc/sudoers.d/kolla_ironic_sudoers \ && touch /usr/local/bin/kolla_ironic_extend_start \ diff --git a/docker/ironic/ironic-base/ironic_sudoers b/docker/ironic/ironic-base/ironic_sudoers index 1a3f32e1a..9b9deed4d 100644 --- a/docker/ironic/ironic-base/ironic_sudoers +++ b/docker/ironic/ironic-base/ironic_sudoers @@ -1,4 +1,3 @@ -ironic ALL = (root) NOPASSWD: /var/lib/kolla/venv/bin/ironic-rootwrap /etc/ironic/rootwrap.conf * ironic ALL = (root) NOPASSWD: /bin/mkdir -p /var/lib/ironic-metrics, /usr/bin/mkdir -p /var/lib/ironic-metrics ironic ALL = (root) NOPASSWD: /bin/chown ironic\:ironic /var/lib/ironic-metrics, /usr/bin/chown ironic\:ironic /var/lib/ironic-metrics ironic ALL = (root) NOPASSWD: /bin/chmod 2755 /var/lib/ironic-metrics, /usr/bin/chmod 2775 /var/lib/ironic-metrics |