diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-04-18 17:49:36 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-04-18 15:50:45 +0000 |
| commit | b58c6aee590cc39ce9c1b16809a52daddfb4fa0e (patch) | |
| tree | 6a34d8ae215a9ac144f8f36ff56c528f8c78e444 | |
| parent | 7347b178eef6d74ec1bad4182bbc474b2fc90b3f (diff) | |
u/fuel: Bump for cmp linux.system retry
Change-Id: I2359b88bfb3ec6c1a1515b3874af6b6a456be318
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 8905694cb9cce2841407d82d403b9d5abde2de6f)
| -rw-r--r-- | patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch | 2 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0010-Add-opnfv-user-to-the-deployment.patch | 4 | ||||
| m--------- | upstream/fuel | 0 |
3 files changed, 3 insertions, 3 deletions
diff --git a/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch index 80df4caf..9d420c4f 100644 --- a/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch @@ -41,7 +41,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> create mode 100644 mcp/salt-formulas/armband/salt_minion.sls diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init -index a7941e00..0c41557d 100755 +index 891eae36..54ffb873 100755 --- a/mcp/config/states/baremetal_init +++ b/mcp/config/states/baremetal_init @@ -35,6 +35,7 @@ wait_for 30.0 "salt -C 'kvm* or cmp*' test.ping" diff --git a/patches/opnfv-fuel/0010-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0010-Add-opnfv-user-to-the-deployment.patch index 083cf37d..a5196f38 100644 --- a/patches/opnfv-fuel/0010-Add-opnfv-user-to-the-deployment.patch +++ b/patches/opnfv-fuel/0010-Add-opnfv-user-to-the-deployment.patch @@ -22,7 +22,7 @@ Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com> create mode 100644 mcp/salt-formulas/opnfv/adduser.sls diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init -index 0c41557d..799a9419 100755 +index 54ffb873..07dcef27 100755 --- a/mcp/config/states/baremetal_init +++ b/mcp/config/states/baremetal_init @@ -23,6 +23,7 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \ @@ -32,7 +32,7 @@ index 0c41557d..799a9419 100755 +salt -C 'kvm* or cmp*' state.apply opnfv.adduser salt -C 'kvm*' state.apply linux.network,linux.system.kernel salt -C 'kvm* or cmp*' state.apply salt.minion - salt -C 'cmp*' state.apply linux.system + wait_for 5.0 "salt -C 'cmp*' state.apply linux.system" diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane index 02a813c9..a179b22c 100755 --- a/mcp/config/states/virtual_control_plane diff --git a/upstream/fuel b/upstream/fuel -Subproject 3d6c3323256d6dde62ea335e53427410f730a19 +Subproject 67b7248e3cc8550ebd757ebb48e2536770f073f |