diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2020-01-20 12:27:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2020-01-20 12:27:15 +0000 |
| commit | e93266360b871183e29ffc0750339e4cff5b92bb (patch) | |
| tree | 89fca984e19531021328ec5fd37d4895f2f537d9 | |
| parent | d8275ad213d3f6a994a545e60b8c064870012d90 (diff) | |
| parent | 848182d7cc62f07dd33c73a7a0837d176ef61a5d (diff) | |
Merge "iec: Use 4.x kernel for K8s compatibility" into stable/iruya
| -rw-r--r-- | mcp/config/scenario/defaults.yaml.j2 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mcp/config/scenario/defaults.yaml.j2 b/mcp/config/scenario/defaults.yaml.j2 index 1e5cd6ed0..cd5cb04cd 100644 --- a/mcp/config/scenario/defaults.yaml.j2 +++ b/mcp/config/scenario/defaults.yaml.j2 @@ -33,7 +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 + {%- endif %} - salt-minion - ifupdown - cloud-init @@ -97,7 +99,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 + {%- endif %} - salt-minion - ifupdown - cloud-init |