airship/images
Code Issues Proposed changes

Dont giveup restart of systemd-resolved service

Browse Source 
Change-Id: Ie3161decc9a5041ba2899f3d2e23e294f6778cd8
This commit is contained in:
Anderson, Craig (ca846m) 2021-04-01 20:36:31 -07:00
parent 25b75c5140
commit 369a1957d4
4 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
image-builder/Makefile
View File

@ -46,7 +46,7 @@ help: ## This help.
@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n make \033[36m<target>\033[0m\n"} /^[a-zA-Z0-9_-]+:.*?##/ { printf " \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST) @awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n make \033[36m<target>\033[0m\n"} /^[a-zA-Z0-9_-]+:.*?##/ { printf " \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
# Make target name that zuul expects for each project in this repo # Make target name that zuul expects for each project in this repo
images: build generate_iso package_qcow images: build generate_iso package_qcow clean
build: build:
set -ex set -ex

3
image-builder/assets/playbooks/roles/osconfig/tasks/main.yaml
View File

@ -37,6 +37,9 @@
- name: "unattended upgrades" - name: "unattended upgrades"
include_tasks: unattended-upgrades.yaml include_tasks: unattended-upgrades.yaml
when: run_context == default_run_context when: run_context == default_run_context
- name: "configure systemd-resolved"
include_tasks: systemd-resolved.yaml
when: run_context == default_run_context
- name: "configure base systemd" - name: "configure base systemd"
include_tasks: systemd.yaml include_tasks: systemd.yaml
when: run_context == default_run_context when: run_context == default_run_context

11
image-builder/assets/playbooks/roles/osconfig/tasks/systemd-resolved.yaml
View File

@ -5,3 +5,14 @@
# dest: "/etc/systemd/resolved.conf" # dest: "/etc/systemd/resolved.conf"
# mode: 0644 # mode: 0644
# when: domain is defined # when: domain is defined
- name: "systemd-resolved | Ensuring systemd-resolved overrides directory exists"
file:
path: "/etc/systemd/system/systemd-resolved.service.d"
state: directory
mode: '0755'
- name: "systemd-resolved | Place startup retry override"
template:
src: systemd-resolved-overrides.j2
dest: "/etc/systemd/system/systemd-resolved.service.d/override.conf"
mode: '0644'

2
image-builder/assets/playbooks/roles/osconfig/templates/systemd-resolved-overrides.j2 Normal file
View File

@ -0,0 +1,2 @@
[Unit]
StartLimitBurst=0