diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2020-01-28 15:06:25 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2020-01-28 15:06:25 +0000 |
| commit | 1f874e5ea342c221b5cf3c9a544020be9a820481 (patch) | |
| tree | 4f51619c2ab40869b0e5d33b70cebeeb44fcc851 /mcp/config/scenario/defaults.yaml.j2 | |
| parent | 86f501765778cb0b345603ff993ce690be787e58 (diff) | |
| parent | 2600894360be0dd0676680e3ced73c4f361a58c0 (diff) | |
Merge "all: Pin Ubuntu kernel to 5.0.0-37 for Bionic" into stable/iruya
Diffstat (limited to 'mcp/config/scenario/defaults.yaml.j2')
| -rw-r--r-- | mcp/config/scenario/defaults.yaml.j2 | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mcp/config/scenario/defaults.yaml.j2 b/mcp/config/scenario/defaults.yaml.j2 index cd5cb04cd..48fb954cc 100644 --- a/mcp/config/scenario/defaults.yaml.j2 +++ b/mcp/config/scenario/defaults.yaml.j2 @@ -33,8 +33,9 @@ x86_64: - saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/18.04/amd64/2017.7 bionic main pkg: install: - {%- if '-iec-' not in conf.MCP_DEPLOY_SCENARIO %} - - linux-generic-hwe-18.04 + {%- if '-iec-' not in conf.MCP_DEPLOY_SCENARIO and conf.MCP_KERNEL_VER %} + - linux-image-{{ conf.MCP_KERNEL_VER }}-generic + - linux-headers-{{ conf.MCP_KERNEL_VER }}-generic {%- endif %} - salt-minion - ifupdown @@ -99,8 +100,9 @@ aarch64: - saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/18.04/amd64/2017.7 bionic main pkg: install: - {%- if '-iec-' not in conf.MCP_DEPLOY_SCENARIO %} - - linux-generic-hwe-18.04 + {%- if '-iec-' not in conf.MCP_DEPLOY_SCENARIO and conf.MCP_KERNEL_VER %} + - linux-image-{{ conf.MCP_KERNEL_VER }}-generic + - linux-headers-{{ conf.MCP_KERNEL_VER }}-generic {%- endif %} - salt-minion - ifupdown |