diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-03 18:20:17 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-03 19:58:31 +0000 |
| commit | cbd85660a376264b5fc3bde17e4d7c9dfbbd53d3 (patch) | |
| tree | b152dcbfec91f14cd8b9ba5854b77083d314d798 /patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch | |
| parent | d79947a082dd7d342b8572d7f74b690cae605b05 (diff) | |
u/fuel: Bump & rebase for debian_ip lowercase fix
While at it, revert commit adding "opnfv" user to "libvirt" group,
as it would break with the current event flow (opnfv user being
created prior to libvirt group).
Change-Id: I6f5d578153c33dcddac76bc7bc6b428fe6796b1a
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 4b7e790d335787ce0837ca47025dd7a14287e52a)
Diffstat (limited to 'patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch')
| -rw-r--r-- | patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch | 4 |
1 files changed, 2 insertions, 2 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 d5a218a5..5b6d6fb6 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 @@ -29,10 +29,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> create mode 100644 mcp/salt-formulas/armband/libvirt_domain_template.sls diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index 7611c12..6d63838 100755 +index 044e645..fb1c439 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane -@@ -24,6 +24,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 salt -C 'kvm*' state.sls armband || true |