u/fuel: Bump & rebase for keyserver proxy rebase

Change-Id: I9ecf7ae9b07f8000e75b13324ebcf8e97981fa22
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

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 07c447b..c32cb2b 100644 (file)
--- 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,7 +41,7 @@ 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 891eae36..54ffb873 100755
+index 91a3c1ec..2de3b9f3 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"

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 a5196f3..a5b2d90 100644 (file)
--- a/patches/opnfv-fuel/0005-Add-opnfv-user-to-the-deployment.patch
+++ b/patches/opnfv-fuel/0005-Add-opnfv-user-to-the-deployment.patch
@@ -22,13 +22,13 @@ 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 54ffb873..07dcef27 100755
+index 2de3b9f3..1dde8527 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 \
    repl="\n        if not __salt__['pkg.version']('vlan'):\n            __salt__['pkg.install']('vlan')"
 
- salt -C 'kvm*' pkg.install bridge-utils
+ salt -C 'kvm* or cmp*' pkg.install bridge-utils
 +salt -C 'kvm* or cmp*' state.apply opnfv.adduser
  salt -C 'kvm*' state.apply linux.network,linux.system.kernel
  salt -C 'kvm* or cmp*' state.apply salt.minion

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 0876b6f..ca2b09a 100644 (file)
--- 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,7 +17,7 @@ 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 ebec944d..d4906c4e 100644
+index cdebe3fb..ba118ec6 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:
@@ -26,9 +26,9 @@ index ebec944d..d4906c4e 100644
        openrc_extra:
 -        volume_device_name: vdc
 +        volume_device_name: sdc
-   bind:
-     server:
-       control:
+   haproxy:
+     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
 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml

diff --git a/upstream/fuel b/upstream/fuel
index 5bef2b9..327cf3f 160000 (submodule)
--- a/upstream/fuel
+++ b/upstream/fuel
@@ -1 +1 @@
-Subproject commit 5bef2b99e26c798eb0a5deb3010662eeb941344b
+Subproject commit 327cf3fb6a1c5745fa9666d4e2762ee1e4eac853