diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-20 18:01:07 +0100 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-21 05:44:10 +0100 |
commit | d1de8877810d0ab0a6e0381e370f5eaa3b07e52d (patch) | |
tree | a6c9a2d3f1dc7e6665b8979b00da3dc24fe666f4 /patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch | |
parent | 1c1cd04959057f18cf8dc4f0331def50f0066442 (diff) |
u/fuel: Bump & rebase for cinder retry
While at it, refresh Armband GPG public key embedded in maas config.
Change-Id: Id69677102ae8fea7a962578bae44e930afea8200
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 7772c2f4..7b120247 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 5a8cb49..c963e59 100755 +index 1d38201..838a2b3 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" |