diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-20 17:54:33 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-21 05:42:46 +0100 |
| commit | cf0e2f19037db5138b09c77b33f2b96b2ad458e8 (patch) | |
| tree | b624e9e4d0c32495d96e43e121f8cdec7d5f043f /patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch | |
| parent | 7c7cc0baae89b0c017d64e41f1317ed48a80ecbd (diff) | |
u/fuel: Bump & rebase for mongodb & cinder fixes
While at it, refresh Armband GPG public key embedded in maas config.
Change-Id: Id1f167d3b8a1bc69a798557fb1b72f93e04cdb0b
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
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 | 10 |
1 files changed, 5 insertions, 5 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 92ea8af7..77eae10e 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,13 +41,13 @@ 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 ef2f78b..771182c 100755 +index 9718a41..5879b0d 100755 --- a/mcp/config/states/baremetal_init +++ b/mcp/config/states/baremetal_init -@@ -28,6 +28,7 @@ salt -C 'kvm* or cmp*' state.apply salt.minion - salt -C 'kvm* or cmp*' service.force_reload salt-minion - salt -C 'cmp*' state.apply linux.system - salt -C 'cmp*' state.apply linux.network || true +@@ -33,6 +33,7 @@ salt -C 'cmp*' state.apply linux.network || true + salt -C 'cmp*' file.write /etc/dhcp/dhclient-enter-hooks.d/no-default-route \ + args='unset new_routers' + +salt -C 'kvm*' state.apply armband.salt_minion salt -C 'kvm* or cmp*' system.reboot wait_for 90.0 "salt -C 'kvm* or cmp*' test.ping" |