aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-03-09 04:04:33 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-03-09 04:05:18 +0100
commit191a1132d9d59268b01cc85c8ae2b88f1104473f (patch)
tree067593d7b6a8b79d3db603f1f9f8d3d5033c773d
parent55c7eee70ea7acf33427ee245c68e0c8b258a3c6 (diff)
u/fuel: Bump for neutron rootwrap fixup
Change-Id: I493dc80c84d5bfd72c1f4062a1d6d600e5f0f0ce Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch2
-rw-r--r--patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch4
-rw-r--r--patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch4
-rw-r--r--patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch4
-rw-r--r--patches/opnfv-fuel/0012-glusterfs-Use-3.12-for-AArch64.patch2
m---------upstream/fuel0
6 files changed, 8 insertions, 8 deletions
diff --git a/patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch b/patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch
index ac0dad1..f8413cb 100644
--- a/patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch
+++ b/patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch
@@ -37,7 +37,7 @@ index df230452..5bbe0fe4 100644
- service.keepalived.cluster.single
- system.glusterfs.server.volume.glance
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
-index bae1c1c6..a6c3d9ed 100644
+index 741f9d35..5c08d6d2 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
@@ -7,6 +7,7 @@
diff --git a/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch b/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch
index e1aefaa..40dce3b 100644
--- a/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch
+++ b/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch
@@ -66,10 +66,10 @@ index 00000000..0368937d
+ file.managed:
+ - source: salt://maas/files/pgpass
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index efe38218..76d782e1 100644
+index e0ad1f70..59b617dd 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
-@@ -17,3 +17,4 @@
+@@ -16,3 +16,4 @@
/usr/share/salt-formulas/env: 0011-system.repo-Debian-Add-keyserver-proxy-support.patch
/usr/share/salt-formulas/env: 0012-routes-Skip-network-restart-on-noifupdown.patch
/usr/share/salt-formulas/env: 0015-Set-ovs-bridges-as-L3-interfaces.patch
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 a50b875..4e2d522 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
@@ -150,10 +150,10 @@ index 00000000..78eb0bff
+
+ #salt_control_seed_{{ cluster_name }}_{{ node_name }}:
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index 76d782e1..0b6bf960 100644
+index 59b617dd..520a2756 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
-@@ -18,3 +18,5 @@
+@@ -17,3 +17,5 @@
/usr/share/salt-formulas/env: 0012-routes-Skip-network-restart-on-noifupdown.patch
/usr/share/salt-formulas/env: 0015-Set-ovs-bridges-as-L3-interfaces.patch
/usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
diff --git a/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch b/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch
index 72d9278..b9800d7 100644
--- a/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch
+++ b/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch
@@ -49,10 +49,10 @@ index 00000000..d40e63b2
+ cmd += 'else sh {0} -c /tmp {1}; fi'.format(
+ os.path.join(tmppath, 'bootstrap-salt.sh'), arg)
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index 0b6bf960..601ad91c 100644
+index 520a2756..f7d25d3b 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
-@@ -20,3 +20,4 @@
+@@ -19,3 +19,4 @@
/usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
/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/patches/opnfv-fuel/0012-glusterfs-Use-3.12-for-AArch64.patch b/patches/opnfv-fuel/0012-glusterfs-Use-3.12-for-AArch64.patch
index c37ba01..4c74200 100644
--- a/patches/opnfv-fuel/0012-glusterfs-Use-3.12-for-AArch64.patch
+++ b/patches/opnfv-fuel/0012-glusterfs-Use-3.12-for-AArch64.patch
@@ -34,7 +34,7 @@ index 84b392e6..1209f312 100644
cluster_node01_address: ${_param:infra_kvm_node01_address}
cluster_node02_address: ${_param:infra_kvm_node02_address}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
-index a6c3d9ed..d730c935 100644
+index 5c08d6d2..e6e5ebf3 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
@@ -34,7 +34,7 @@ parameters:
diff --git a/upstream/fuel b/upstream/fuel
-Subproject 21f34dab9380f98622c0075fa8f4b5868916a27
+Subproject 9972139f91debfe24c8cb3cfcdfbc595619659e