diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-31 16:44:47 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-31 16:45:20 +0100 |
| commit | f7a780a85429d1975e3109e67760865d2ee2226d (patch) | |
| tree | 42d5a094b30e400b22ab96c109e9eed2e06dfabe | |
| parent | a5aa1b1a42bd9d067e535636e86cd5189d3fef53 (diff) | |
u/fuel: Bump & rebase for reclass update
Change-Id: I094243a4678cd3a458b39961ac5e28f65c85b09a
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
| -rw-r--r-- | patches/opnfv-fuel/0002-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/0002-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch index 55a63019..d80a832e 100644 --- a/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch +++ b/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch @@ -69,7 +69,7 @@ index 9fc30bb..998fc6b 100755 salt -I 'horizon:server' file.symlink \ /var/lib/openstack-dashboard/static \ diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index 75347d9..8b162d5 100755 +index 338c447..009eeba 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 67c1e765..0d24d07b 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 fb20a81..a174640 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 8b162d5..849a4bc 100755 +index 009eeba..9349e7e 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 5532af2b423237474b7667250c81ada25542689 +Subproject 9b984e9be0ea5e78d111f57e2ea1c156b7b816a |