aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharalampos Kominos <Charalampos.Kominos@enea.com>2017-11-08 12:35:21 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-08 15:08:08 +0100
commit00d1b6b2e00803bcb3901b181ec7d97e8062f677 (patch)
tree7b6d0e0e0032208275de4ca51b9ef6c9c54e0a10
parent67aed7515601fc8b4d2dea326c4e634de7f8fa48 (diff)
u/fuel: Bump & rebase for curtin network config
Change-Id: Iaaea7494b960b05c4e409eb52daa6b0fa6414e12 Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
-rw-r--r--patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch4
-rw-r--r--patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch4
-rw-r--r--patches/opnfv-fuel/0009-mcp-salt-formulas-armband-AArch64-bootstrap.patch4
-rw-r--r--patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch6
-rw-r--r--patches/opnfv-fuel/0014-baremetal-linux-image-generic-hwe-16.04-edge.patch4
m---------upstream/fuel0
6 files changed, 11 insertions, 11 deletions
diff --git a/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch
index 14a2c9a..91d70fe 100644
--- a/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch
+++ b/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch
@@ -70,10 +70,10 @@ index e816a9d..f688f5c 100755
salt -I 'mongodb:server' state.sls mongodb || true
wait_for 90 "salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin'"
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
-index 9ebf4bf..044e645 100755
+index d02ea43..5a99aef 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
-@@ -26,6 +26,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \
+@@ -27,6 +27,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \
salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp
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 5b6d6fb..d478960 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
@@ -29,10 +29,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
create mode 100644 mcp/salt-formulas/armband/libvirt_domain_template.sls
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
-index 044e645..fb1c439 100755
+index 5a99aef..2163069 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
-@@ -27,6 +27,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \
+@@ -28,6 +28,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \
salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp
salt -C 'kvm*' state.sls armband || true
diff --git a/patches/opnfv-fuel/0009-mcp-salt-formulas-armband-AArch64-bootstrap.patch b/patches/opnfv-fuel/0009-mcp-salt-formulas-armband-AArch64-bootstrap.patch
index b313976..1b6094c 100644
--- a/patches/opnfv-fuel/0009-mcp-salt-formulas-armband-AArch64-bootstrap.patch
+++ b/patches/opnfv-fuel/0009-mcp-salt-formulas-armband-AArch64-bootstrap.patch
@@ -32,10 +32,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
create mode 100644 mcp/salt-formulas/armband/files/cloud.py.diff
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
-index fb1c439..0afd530 100755
+index 2163069..ec1cd00 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
-@@ -20,6 +20,7 @@ salt -C 'kvm*' pkg.install bridge-utils
+@@ -21,6 +21,7 @@ salt -C 'kvm*' pkg.install bridge-utils
salt -C 'kvm*' state.apply linux.network
salt -C 'cmp*' state.apply linux.system
salt -C 'cmp*' state.apply linux.network || true
diff --git a/patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch
index d5df3da..3418177 100644
--- a/patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch
+++ b/patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch
@@ -21,10 +21,10 @@ Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
create mode 100644 mcp/salt-formulas/opnfv/adduser.sls
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
-index 0afd530..ccf7152 100755
+index ec1cd00..7746bac 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
-@@ -17,6 +17,7 @@ salt -C 'kvm* or cmp*' file.line \
+@@ -18,6 +18,7 @@ salt -C 'kvm* or cmp*' file.line \
/usr/lib/python2.7/dist-packages/salt/modules/debian_ip.py \
content='iface = iface.lower()' mode='delete'
salt -C 'kvm*' pkg.install bridge-utils
@@ -32,7 +32,7 @@ index 0afd530..ccf7152 100755
salt -C 'kvm*' state.apply linux.network
salt -C 'cmp*' state.apply linux.system
salt -C 'cmp*' state.apply linux.network || true
-@@ -47,6 +48,7 @@ while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do
+@@ -48,6 +49,7 @@ while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do
rc=0
for node in $vcp_nodes; do
salt "$node" test.ping 2>/dev/null || { rc=$?; break; };
diff --git a/patches/opnfv-fuel/0014-baremetal-linux-image-generic-hwe-16.04-edge.patch b/patches/opnfv-fuel/0014-baremetal-linux-image-generic-hwe-16.04-edge.patch
index 10af5d3..35d9259 100644
--- a/patches/opnfv-fuel/0014-baremetal-linux-image-generic-hwe-16.04-edge.patch
+++ b/patches/opnfv-fuel/0014-baremetal-linux-image-generic-hwe-16.04-edge.patch
@@ -31,10 +31,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
1 file changed, 3 insertions(+)
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
-index ccf7152..8fcb8fe 100755
+index 7746bac..a54b7fe 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
-@@ -22,6 +22,9 @@ salt -C 'kvm*' state.apply linux.network
+@@ -23,6 +23,9 @@ salt -C 'kvm*' state.apply linux.network
salt -C 'cmp*' state.apply linux.system
salt -C 'cmp*' state.apply linux.network || true
salt -C 'kvm*' state.apply armband.bootstrap_script_arm64 || true
diff --git a/upstream/fuel b/upstream/fuel
-Subproject fa58515facceeffd40883e36da277d56fc5e8d9
+Subproject 6726ba6362b79527c210487ff37419142d9f93b