diff options
author | Charalampos Kominos <Charalampos.Kominos@enea.com> | 2017-11-08 12:35:21 +0100 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-08 14:06:41 +0000 |
commit | abfef7b5acc25201d263e68e61ef01c375818bc9 (patch) | |
tree | 7b6d0e0e0032208275de4ca51b9ef6c9c54e0a10 /patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch | |
parent | f02e6423174aec5cce72ca209be9aec2f5562369 (diff) |
u/fuel: Bump & rebase for curtin network config
Change-Id: Iaaea7494b960b05c4e409eb52daa6b0fa6414e12
Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
(cherry picked from commit 00d1b6b2e00803bcb3901b181ec7d97e8062f677)
Diffstat (limited to 'patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch')
-rw-r--r-- | patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch index 14a2c9af..91d70fe7 100644 --- a/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch +++ b/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch @@ -70,10 +70,10 @@ index e816a9d..f688f5c 100755 salt -I 'mongodb:server' state.sls mongodb || true wait_for 90 "salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin'" diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index 9ebf4bf..044e645 100755 +index d02ea43..5a99aef 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane -@@ -26,6 +26,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \ +@@ -27,6 +27,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \ salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp |