diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-07-26 02:00:05 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-07-26 02:00:05 +0200 |
| commit | f9e87162f57a5fcc7cfa6f68cbd818c3306d3dec (patch) | |
| tree | c6101fe03a3aea68fee22fe09842ee2dd08c9099 /patches | |
| parent | b2cc542dabde2ff8e7217e251d54d80d810c8e4b (diff) | |
u/fuel: Bump & rebase for _orchestration.conf fix
Change-Id: Ifb4ba7e0bb06b214e682e76ec3204c7e5d411f05
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches')
3 files changed, 7 insertions, 7 deletions
diff --git a/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch index b98bdc95..1e986544 100644 --- a/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch +++ b/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch @@ -64,7 +64,7 @@ index 70db238b..52d643df 100755 + +salt -I 'nova:compute' state.sls armband diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index 18e6d1cd..64d73953 100755 +index 8105b266..cc227a97 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -27,6 +27,7 @@ if [ "${ERASE_ENV}" -eq 1 ]; then diff --git a/patches/opnfv-fuel/0002-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0002-mcp-salt-formulas-armband-Extend-libvirt_domain.patch index 086cfcab..cc405a13 100644 --- a/patches/opnfv-fuel/0002-mcp-salt-formulas-armband-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0002-mcp-salt-formulas-armband-Extend-libvirt_domain.patch @@ -41,11 +41,11 @@ 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 6a44b788..6f935445 100755 +index 3e5f659f..674a1bfd 100755 --- a/mcp/config/states/baremetal_init +++ b/mcp/config/states/baremetal_init -@@ -31,6 +31,7 @@ wait_for 5.0 "salt -C 'kvm* or cmp*' state.apply opnfv.route_wrapper" - wait_for 5.0 "salt -C 'cmp*' state.apply linux.network" +@@ -28,6 +28,7 @@ wait_for 5.0 "salt -C 'kvm* or cmp*' state.apply salt.minion" + wait_for 5.0 "salt -C 'cmp*' state.apply linux.system,linux.network" wait_for 30.0 "salt -C 'kvm* or cmp*' test.ping" +salt -C 'kvm*' state.apply armband.salt_minion diff --git a/patches/opnfv-fuel/0004-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0004-Add-opnfv-user-to-the-deployment.patch index f158ed40..8f2e901c 100644 --- a/patches/opnfv-fuel/0004-Add-opnfv-user-to-the-deployment.patch +++ b/patches/opnfv-fuel/0004-Add-opnfv-user-to-the-deployment.patch @@ -22,7 +22,7 @@ Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com> create mode 100644 mcp/salt-formulas/opnfv/adduser.sls diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init -index 6f935445..f685ab87 100755 +index 674a1bfd..0b24acd6 100755 --- a/mcp/config/states/baremetal_init +++ b/mcp/config/states/baremetal_init @@ -23,6 +23,7 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \ @@ -32,9 +32,9 @@ index 6f935445..f685ab87 100755 +salt -C 'kvm* or cmp*' state.apply opnfv.adduser salt -C 'kvm*' state.apply linux.network,linux.system.kernel wait_for 5.0 "salt -C 'kvm* or cmp*' state.apply salt.minion" - wait_for 5.0 "salt -C 'cmp*' state.apply linux.system" + wait_for 5.0 "salt -C 'cmp*' state.apply linux.system,linux.network" diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index 64d73953..d8c4e776 100755 +index cc227a97..51823a0c 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -39,6 +39,7 @@ vcp_nodes=$(salt --out yaml 'kvm01*' pillar.get salt:control:cluster:internal:no |