diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-22 17:33:05 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-22 17:42:13 +0200 |
| commit | a6f5b5b13b3d9b62a9ee13d7bf19b695802bc5ce (patch) | |
| tree | 0c4c696e6f8cdb711213adcbf48c99330d597419 /patches/opnfv-fuel/0015-mcp-salt-formulas-armband-Extend-libvirt_domain.patch | |
| parent | 42c5ac6116dc7cc864325e92806ee82f1a6b6d42 (diff) | |
p/fuel: Rebase: openstack_ha upstream sync
Change-Id: I87a2259ddcbc3ab69cde7a3f3e78a79dc907a5d9
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0015-mcp-salt-formulas-armband-Extend-libvirt_domain.patch')
| -rw-r--r-- | patches/opnfv-fuel/0015-mcp-salt-formulas-armband-Extend-libvirt_domain.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/opnfv-fuel/0015-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0015-mcp-salt-formulas-armband-Extend-libvirt_domain.patch index f56cb68a..dda55e42 100644 --- a/patches/opnfv-fuel/0015-mcp-salt-formulas-armband-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0015-mcp-salt-formulas-armband-Extend-libvirt_domain.patch @@ -21,10 +21,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/maas b/mcp/config/states/maas -index 13a8263..fef7a62 100755 +index f83f4a7..bc8d04f 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas -@@ -48,7 +48,7 @@ wait_for "! salt '*' test.ping | tee /dev/stderr | fgrep -q 'Not connected'" +@@ -51,7 +51,7 @@ wait_for "! salt '*' test.ping | tee /dev/stderr | fgrep -q 'Not connected'" salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp |