aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-18 22:54:55 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-18 22:56:12 +0100
commit569c2cc53dc3a65140978c2bfa89db1500aba1a0 (patch)
tree4a61928c38f2b0847d5696c0cdedc9b335090064
parente02b8d4f72f2a84c857b1e8bda380f586e679ad0 (diff)
u/fuel: Bump & rebase for MaaS DHCP fix
Change-Id: Icb3516e6520ea6c1996ffffa744b6cfeb1135f41 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch14
-rw-r--r--patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch12
-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/0011-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch4
m---------upstream/fuel0
6 files changed, 19 insertions, 19 deletions
diff --git a/patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch b/patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch
index d35b63d..9dce8c5 100644
--- a/patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch
+++ b/patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch
@@ -41,32 +41,32 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/mcp/config/states/networks b/mcp/config/states/networks
-index d4735ad..e566903 100755
+index 5beabdb..ca59ee3 100755
--- a/mcp/config/states/networks
+++ b/mcp/config/states/networks
-@@ -18,7 +18,7 @@ PUBLIC_NET=$(salt --out yaml 'cmp*' pillar.get _param:external_address | \
+@@ -18,7 +18,7 @@ PUBLIC_NET=$(salt --out yaml -C 'I@nova:compute and *01*' pillar.get _param:exte
pillar.get _param:openstack_compute_node01_external_address | \
awk --re-interval '/[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}/{print $2; exit}')
-[ -n "${PUBLIC_NET}" ] && PUBLIC_NET="${PUBLIC_NET%.*}.0/24" || PUBLIC_NET="10.16.0.0/24"
+[ -n "${PUBLIC_NET}" ] && PUBLIC_NET="${PUBLIC_NET%.*}.0/24" || PUBLIC_NET="10.0.9.0/24"
- salt 'ctl01*' cmd.run ". /root/keystonercv3; \
+ salt -C 'I@nova:controller and *01*' cmd.run ". /root/keystonercv3; \
openstack compute service list; \
-@@ -29,6 +29,6 @@ salt 'ctl01*' cmd.run ". /root/keystonercv3; \
+@@ -29,6 +29,6 @@ salt -C 'I@nova:controller and *01*' cmd.run ". /root/keystonercv3; \
openstack network create --external --default --provider-network-type flat \
--provider-physical-network physnet1 floating_net"
- salt 'ctl01*' cmd.run ". /root/keystonercv3; \
+ salt -C 'I@nova:controller and *01*' cmd.run ". /root/keystonercv3; \
- openstack subnet create --gateway ${PUBLIC_NET%.*}.1 --no-dhcp \
- --allocation-pool start=${PUBLIC_NET%.*}.130,end=${PUBLIC_NET%.*}.254 \
+ openstack subnet create --gateway ${PUBLIC_NET%.*}.254 --no-dhcp \
+ --allocation-pool start=${PUBLIC_NET%.*}.130,end=${PUBLIC_NET%.*}.200 \
--network floating_net --subnet-range ${PUBLIC_NET} floating_subnet"
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml
-index 3c3d526..e114ec2 100644
+index ada2c25..0faf478 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml
-@@ -61,13 +61,13 @@ parameters:
+@@ -62,13 +62,13 @@ parameters:
params:
single_address: 172.16.10.105
tenant_address: 10.1.0.105
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 aac8b0d..c275b04 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
@@ -64,22 +64,22 @@ index 0000000..0368937
+ file.managed:
+ - source: salt://maas/files/pgpass
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index a87a935..fe3ff14 100644
+index d16e3c2..0e1b7f6 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
-@@ -15,3 +15,4 @@
- /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch
+@@ -16,3 +16,4 @@
+ /usr/share/salt-formulas/env: 0011-maas-region-interface-default-mode-DHCP.patch
/usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch
/usr/share/salt-formulas/env: 0013-libvirt-unix_sock_group-s-libvirtd-libvirt.patch
+/usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
-index 56cd96b..141f363 100644
+index 6332776..7292ebb 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
-@@ -107,6 +107,32 @@ parameters:
+@@ -108,6 +108,32 @@ parameters:
architecture: ${_param:opnfv_maas_node05_architecture}
distro_series: xenial
- hwe_kernel: hwe-16.04
+ hwe_kernel: ${_param:hwe_kernel}
+ cluster:
+ enabled: true
+ region:
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 a09c728..eb4fb80 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 0000000..a9fe11b
+
+ #salt_control_seed_{{ cluster_name }}_{{ node_name }}:
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index fe3ff14..5d28cfa 100644
+index 0e1b7f6..ec9fc78 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
-@@ -16,3 +16,5 @@
+@@ -17,3 +17,5 @@
/usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch
/usr/share/salt-formulas/env: 0013-libvirt-unix_sock_group-s-libvirtd-libvirt.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 46a9170..961c107 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 0000000..d40e63b
+ 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 5d28cfa..42e0c9c 100644
+index ec9fc78..258ac78 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
-@@ -18,3 +18,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/0011-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch b/patches/opnfv-fuel/0011-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch
index da8e214..db415ec 100644
--- a/patches/opnfv-fuel/0011-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch
+++ b/patches/opnfv-fuel/0011-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch
@@ -19,10 +19,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml
-index fe4be9d..664b9d5 100644
+index 0d4c666..57af635 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml
-@@ -199,7 +199,7 @@ parameters:
+@@ -189,7 +189,7 @@ parameters:
repo:
uca:
source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/${_param:openstack_version} main"
diff --git a/upstream/fuel b/upstream/fuel
-Subproject 2fc4b8890ef1ad456ac1ff421f33e005ae0484b
+Subproject 5ceea06b5395115e0e45d0631e726062eb1b0d1