aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-18 22:17:00 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-18 22:18:50 +0100
commit939bdcd9a425674eaca2d9556da4f34f11b0e23f (patch)
treec8010b6d518714bff0cb864b8a8d3b8cfa546d89
parent9b3121843a78026761a086581fc34589faed25af (diff)
u/fuel: Bump & rebase for netconfig rm via salt
Change-Id: I0de153ef4e5a71f350d29a90ae4c79b863d676eb Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--patches/opnfv-fuel/0001-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/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch6
-rw-r--r--patches/opnfv-fuel/0009-mcp-salt-formulas-armband-AArch64-bootstrap.patch4
-rw-r--r--patches/opnfv-fuel/0011-aarch64-skip-configuration-of-hugepages.patch2
-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.patch6
m---------upstream/fuel0
8 files changed, 16 insertions, 16 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 cc8599a..3c41388 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
@@ -68,10 +68,10 @@ index e1fdf73..e1f705c 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 43d1520..88e7080 100755
+index b9db08a..c798209 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
-@@ -34,6 +34,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \
+@@ -32,6 +32,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 0533412..9748da1 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 88e7080..aef2c28 100755
+index c798209..57c5685 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
-@@ -35,6 +35,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \
+@@ -33,6 +33,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/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch
index b19103b..ba5f295 100644
--- a/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch
@@ -160,10 +160,10 @@ index d3352cc..059e3ef 100644
+/usr/share/salt-formulas/env: 0103-virtng-module-Extend-libvirt_domain.patch
+/usr/share/salt-formulas/env: 0104-salt-control-virt-Extend-libvirt_domain.patch
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
-index 004f72a..b7054e9 100644
+index 7f2f572..9698875 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
-@@ -42,21 +42,33 @@ parameters:
+@@ -46,21 +46,33 @@ parameters:
openstack.control:
cpu: 4
ram: 12288
@@ -197,7 +197,7 @@ index 004f72a..b7054e9 100644
disk_profile: xxlarge
net_profile: default
# stacklight.log:
-@@ -77,6 +89,9 @@ parameters:
+@@ -81,6 +93,9 @@ parameters:
openstack.proxy:
cpu: 2
ram: 2048
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 90416ad..99b43ec 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 aef2c28..e8b4271 100755
+index 57c5685..8b9e3ef 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
-@@ -28,6 +28,7 @@ salt -C 'kvm*' pkg.install bridge-utils
+@@ -26,6 +26,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/0011-aarch64-skip-configuration-of-hugepages.patch b/patches/opnfv-fuel/0011-aarch64-skip-configuration-of-hugepages.patch
index 844b052..7aef232 100644
--- a/patches/opnfv-fuel/0011-aarch64-skip-configuration-of-hugepages.patch
+++ b/patches/opnfv-fuel/0011-aarch64-skip-configuration-of-hugepages.patch
@@ -20,7 +20,7 @@ Signed-off-by: Charalampos Kominos <charalampos.kominos@enea.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
-index 30dda2f..653a9d7 100644
+index a78850f..ce67588 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
@@ -12,8 +12,8 @@ classes:
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 d7d8be1..8e27230 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 e8b4271..585a808 100755
+index 8b9e3ef..34fe956 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
-@@ -25,6 +25,7 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \
+@@ -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
@@ -32,7 +32,7 @@ index e8b4271..585a808 100755
salt -C 'kvm*' state.apply linux.network
salt -C 'cmp*' state.apply linux.system
salt -C 'cmp*' state.apply linux.network || true
-@@ -55,6 +56,7 @@ while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do
+@@ -53,6 +54,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 510b96f..34b4b44 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
@@ -32,10 +32,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
-index 585a808..373281d 100755
+index 34fe956..b87ed69 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
-@@ -27,9 +27,12 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \
+@@ -25,9 +25,12 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \
salt -C 'kvm*' pkg.install bridge-utils
salt -C '*' state.apply opnfv.adduser
salt -C 'kvm*' state.apply linux.network
@@ -49,7 +49,7 @@ index 585a808..373281d 100755
salt -C 'kvm* or cmp*' system.reboot
wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \
"tee /dev/stderr | grep -Fq 'Not connected'"
-@@ -69,3 +72,10 @@ wait_for 10 "! salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply linux,ntp |
+@@ -67,3 +70,10 @@ wait_for 10 "! salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply linux,ntp |
wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' ssh.set_auth_key ${SUDO_USER} \
$(awk 'NR==1{print $2}' "$(eval echo "~${SUDO_USER}/.ssh/authorized_keys")")"
diff --git a/upstream/fuel b/upstream/fuel
-Subproject 49021c0d3853cf23690743fe3ff26d055ff3ee5
+Subproject 69902a264c8090447ea141044c6cf5747bf8931