u/fuel: Bump & rebase for static PXE/admin IPs

Change-Id: Ic86aad4afb74f6254ae8362db03a88e5e8cf967a

5 files changed, 28 insertions, 26 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 fe7bc75f..b98bdc95 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 c391cfe6..02a813c9 100755
+index 18e6d1cd..64d73953 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-vPDF-Use-arm-virtual2-POD-config-in-sample.patch b/patches/opnfv-fuel/0002-vPDF-Use-arm-virtual2-POD-config-in-sample.patch
index c3ffa52a..f26994f2 100644
--- a/patches/opnfv-fuel/0002-vPDF-Use-arm-virtual2-POD-config-in-sample.patch
+++ b/patches/opnfv-fuel/0002-vPDF-Use-arm-virtual2-POD-config-in-sample.patch
@@ -23,7 +23,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  1 file changed, 11 insertions(+), 11 deletions(-)
 
 diff --git a/mcp/config/labs/local/idf-virtual1.yaml b/mcp/config/labs/local/idf-virtual1.yaml
-index 79a5fa04..8a5fbb91 100644
+index 402af985..2d449c8e 100644
 --- a/mcp/config/labs/local/idf-virtual1.yaml
 +++ b/mcp/config/labs/local/idf-virtual1.yaml
 @@ -42,10 +42,10 @@ idf:
@@ -40,7 +40,7 @@ index 79a5fa04..8a5fbb91 100644
        dns:
          - 8.8.8.8
          - 8.8.4.4
-@@ -61,16 +61,16 @@ idf:
+@@ -63,16 +63,16 @@ idf:
          # Ordered-list, index should be in sync with node index in PDF
          - interfaces: &interfaces
              # Ordered-list, index should be in sync with interface index in PDF
diff --git a/patches/opnfv-fuel/0003-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0003-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
index 57a9a9ca..086cfcab 100644
--- a/patches/opnfv-fuel/0003-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0003-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
@@ -41,12 +41,12 @@ 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 c0233389..5a1e9ab7 100755
+index 6a44b788..6f935445 100755
 --- a/mcp/config/states/baremetal_init
 +++ b/mcp/config/states/baremetal_init
-@@ -35,6 +35,7 @@ wait_for 30.0 "salt -C 'kvm* or cmp*' test.ping"
- salt -C 'cmp*' file.write /etc/dhcp/dhclient-enter-hooks.d/no-default-route \
-   args='unset new_routers'
+@@ -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"
+ wait_for 30.0 "salt -C 'kvm* or cmp*' test.ping"
 
 +salt -C 'kvm*' state.apply armband.salt_minion
  salt -C 'kvm* or cmp*' system.reboot
diff --git a/patches/opnfv-fuel/0005-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0005-Add-opnfv-user-to-the-deployment.patch
index 72c04ee4..f158ed40 100644
--- a/patches/opnfv-fuel/0005-Add-opnfv-user-to-the-deployment.patch
+++ b/patches/opnfv-fuel/0005-Add-opnfv-user-to-the-deployment.patch
@@ -14,15 +14,15 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
 Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
 ---
- mcp/config/states/baremetal_init                         | 1 +
- mcp/config/states/virtual_control_plane                  | 1 +
- mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml | 4 ++++
- mcp/salt-formulas/opnfv/adduser.sls                      | 7 +++++++
- 4 files changed, 13 insertions(+)
+ mcp/config/states/baremetal_init                           | 1 +
+ mcp/config/states/virtual_control_plane                    | 1 +
+ .../classes/cluster/all-mcp-arch-common/init.yml.j2        | 3 +++
+ mcp/salt-formulas/opnfv/adduser.sls                        | 7 +++++++
+ 4 files changed, 12 insertions(+)
  create mode 100644 mcp/salt-formulas/opnfv/adduser.sls
 
 diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init
-index 5a1e9ab7..9fa5d5a7 100755
+index 6f935445..f685ab87 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 \
@@ -34,7 +34,7 @@ index 5a1e9ab7..9fa5d5a7 100755
  wait_for 5.0 "salt -C 'kvm* or cmp*' state.apply salt.minion"
  wait_for 5.0 "salt -C 'cmp*' state.apply linux.system"
 diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
-index 02a813c9..a179b22c 100755
+index 64d73953..d8c4e776 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
@@ -45,18 +45,20 @@ index 02a813c9..a179b22c 100755
  wait_for 10.0 "salt -C '* and not cfg01* and not mas01*' saltutil.sync_all"
 
  # Propagate APT proxy config created by curtin on baremetal nodes to VCP VMs
-diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml
-index f9aeb71a..21a5de4e 100644
---- a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml
-+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml
-@@ -9,3 +9,7 @@
- classes:
-   - cluster.all-mcp-arch-common.arch
+diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2
+index 19475c71..1a3c84fc 100644
+--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2
++++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2
+@@ -10,6 +10,9 @@ classes:
    - cluster.all-mcp-arch-common.opnfv
-+parameters:
-+  _param:
+ parameters:
+   _param:
 +    opnfv_user_username: opnfv
 +    opnfv_user_password: $1$5/pIEHT1$XFBhNWW4Q8gYd19hczgPF1
++
+     salt_control_trusty_image: ''  # Dummy value, to keep reclass 1.5.2 happy
+     salt_control_xenial_image: salt://salt/files/control/images/base_image_opnfv_fuel_vcp.img
+
 diff --git a/mcp/salt-formulas/opnfv/adduser.sls b/mcp/salt-formulas/opnfv/adduser.sls
 new file mode 100644
 index 00000000..78ef993d
diff --git a/patches/opnfv-fuel/0006-Set-volume-name-in-source-file-to-sdX.patch b/patches/opnfv-fuel/0006-Set-volume-name-in-source-file-to-sdX.patch
index 458a84ca..36a03373 100644
--- a/patches/opnfv-fuel/0006-Set-volume-name-in-source-file-to-sdX.patch
+++ b/patches/opnfv-fuel/0006-Set-volume-name-in-source-file-to-sdX.patch
@@ -17,10 +17,10 @@ Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
-index 1870cc46..6378f77d 100644
+index ceb3622b..49318588 100644
 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
-@@ -130,7 +130,7 @@ parameters:
+@@ -127,7 +127,7 @@ parameters:
      server:
        cacert: /etc/ssl/certs/mcp_os_cacert
        openrc_extra:
@@ -30,7 +30,7 @@ index 1870cc46..6378f77d 100644
      proxy:
        listen:
 diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml
-index c4915c79..97dd268f 100644
+index f458281c..e17a5f16 100644
 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml
 +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml
 @@ -72,7 +72,7 @@ parameters: