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/scripts | |
| 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/scripts')
| -rw-r--r-- | mcp/scripts/globals.sh | 1 | ||||
| m--------- | mcp/scripts/pharos | 0 |
2 files changed, 1 insertions, 0 deletions
diff --git a/mcp/scripts/globals.sh b/mcp/scripts/globals.sh index 29506dc8f..e5d1decc6 100644 --- a/mcp/scripts/globals.sh +++ b/mcp/scripts/globals.sh @@ -13,6 +13,7 @@ export SSH_KEY=${SSH_KEY:-"/var/lib/opnfv/mcp.rsa"} export SALT_MASTER=${INSTALLER_IP:-10.20.0.2} export SALT_MASTER_USER=${SALT_MASTER_USER:-ubuntu} export VIRSH=${VIRSH:-'virsh --connect qemu:///system'} +export MCP_KERNEL_VER=${MCP_KERNEL_VER:-5.0.0-37} # Derived from INSTALLER_IP export MCPCONTROL_NET=${MCPCONTROL_NET:-${SALT_MASTER%.*}.0} diff --git a/mcp/scripts/pharos b/mcp/scripts/pharos -Subproject 9b9235ea136928b8148c57b1c3f3ddee6f761e6 +Subproject 061b5588d40253193eddf76139c361d62e6fbeb |