aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-06-12 16:28:30 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-06-12 16:29:24 +0200
commit7efff0861d589abc47d2a8b266e763e5b14932a1 (patch)
tree343d7b9ce2bcf1f8ee78cb46b0f52294d773be9e
parent6fcc669084d3a26136454a4d932f68cc900a71c0 (diff)
u/fuel: Bump & rebase for sphinx metadata fix
Change-Id: I5cd68ef6cb5b1d3f2423ea9f69eaa64daa85a03f Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--patches/opnfv-fuel/0003-mcp-salt-formulas-armband-Extend-libvirt_domain.patch2
-rw-r--r--patches/opnfv-fuel/0005-Add-opnfv-user-to-the-deployment.patch4
-rw-r--r--patches/opnfv-fuel/0006-Set-volume-name-in-source-file-to-sdX.patch2
m---------upstream/fuel0
4 files changed, 4 insertions, 4 deletions
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 c32cb2b5..57a9a9ca 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,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 91a3c1ec..2de3b9f3 100755
+index c0233389..5a1e9ab7 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 a5b2d909..72c04ee4 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
@@ -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 2de3b9f3..1dde8527 100755
+index 5a1e9ab7..9fa5d5a7 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 \
@@ -31,7 +31,7 @@ index 2de3b9f3..1dde8527 100755
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
+ 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
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 ca2b09ad..7877dfa8 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,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 cdebe3fb..ba118ec6 100644
+index 52f5f910..e0c9a628 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:
diff --git a/upstream/fuel b/upstream/fuel
-Subproject 327cf3fb6a1c5745fa9666d4e2762ee1e4eac85
+Subproject 60cd82b0e2af9c8f34a97eacd4cee0893684e6a