diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-13 23:28:38 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-15 01:10:12 +0000 |
| commit | 6e71b19097781a7190bcec015afc62be7961fa43 (patch) | |
| tree | 4c0dce6536ffa7090f10af75aabcea0de16efffc /patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch | |
| parent | 956d1d0056c54fe4c886126dcf489b547b01d49a (diff) | |
u/fuel: Bump & rebase for VCP state split
Change-Id: I6f0367d75ea831de78ced480ea73d1cd10680b80
(cherry picked from commit 11143873e70e65d07d73617b8af29a07adffc1aa)
Diffstat (limited to 'patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch')
| -rw-r--r-- | patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch index 6a782a90..73a0a786 100644 --- a/patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch @@ -21,18 +21,18 @@ specific values. Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> --- - mcp/config/states/maas | 2 +- + mcp/config/states/virtual_control_plane | 2 +- .../armband/files/libvirt_domain.jinja.diff | 46 ++++++++++++++++++++++ .../armband/libvirt_domain_template.sls | 4 ++ 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 mcp/salt-formulas/armband/files/libvirt_domain.jinja.diff create mode 100644 mcp/salt-formulas/armband/libvirt_domain_template.sls -diff --git a/mcp/config/states/maas b/mcp/config/states/maas -index ad61b97..baa9b13 100755 ---- a/mcp/config/states/maas -+++ b/mcp/config/states/maas -@@ -90,7 +90,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | fgrep -q 'Not connected +diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane +index 79ad880..327b159 100755 +--- a/mcp/config/states/virtual_control_plane ++++ b/mcp/config/states/virtual_control_plane +@@ -12,7 +12,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | grep -Fq 'Not connected salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp |