diff options
| -rw-r--r-- | patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch | 2 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch | 2 | ||||
| m--------- | upstream/fuel | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch index 182c3bc9..f27ccb24 100644 --- a/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch +++ b/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch @@ -67,7 +67,7 @@ index cc46ac1..e70b6d3 100755 + +salt -I 'nova:compute' state.sls armband diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index 9a77c76..a3fcb02 100755 +index f97e9b7..f0da66f 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -27,6 +27,7 @@ if [ "${ERASE_ENV}" -eq 1 ]; then diff --git a/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch index 3292ee24..27c321b5 100644 --- a/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch +++ b/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch @@ -34,7 +34,7 @@ index 15fc572..7c86513 100755 salt -C 'kvm* or cmp*' state.apply salt.minion salt -C 'cmp*' state.apply linux.system diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index a3fcb02..c4bd3dd 100755 +index f0da66f..b9c252b 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -49,6 +49,7 @@ while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do diff --git a/upstream/fuel b/upstream/fuel -Subproject 48055f477ec91491bce13230b652939f1941dbb +Subproject 7a464cc994463231bb7d5dfbc9a29bcfcea5bbd |