summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-08-23 15:38:06 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-08-23 15:39:40 +0200
commit93f8d97757dfe37d262a95148ac94f7a2c78a64e (patch)
treea4393db9b1f34b11be4ece05f7164bdd9ecba8f8 /patches
parent2cc327653a8a294346e6d47b0c94e9486414608a (diff)
p/fuel: Rebase after authorized_keys fix upstream
Change-Id: Id53c2513b52d05a44dffda0fda40f8df259e226b Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches')
-rw-r--r--patches/opnfv-fuel/0000-states-network-parametrize-Openstack-public-net.patch45
-rw-r--r--patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch2
-rw-r--r--patches/opnfv-fuel/0007-mcp-config-AArch64-baremetal-Use-arm64-image.patch (renamed from patches/opnfv-fuel/0008-mcp-config-AArch64-baremetal-Use-arm64-image.patch)0
-rw-r--r--patches/opnfv-fuel/0007-states-maas-Add-mcp.rsa.pub-to-authorized_keys.patch31
-rw-r--r--patches/opnfv-fuel/0008-classes-baremetal-AArch64-virtio-NIC-names-sync.patch (renamed from patches/opnfv-fuel/0009-classes-baremetal-AArch64-virtio-NIC-names-sync.patch)0
-rw-r--r--patches/opnfv-fuel/0009-maas-Add-curtin_userdata_arm64_generic_xenial.patch (renamed from patches/opnfv-fuel/0010-maas-Add-curtin_userdata_arm64_generic_xenial.patch)0
-rw-r--r--patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch (renamed from patches/opnfv-fuel/0011-network-public-mgmt-Use-arm-pod3-POD-config.patch)2
-rw-r--r--patches/opnfv-fuel/0011-classes-baremetal-arm-pod3-config-hardcode.patch (renamed from patches/opnfv-fuel/0012-classes-baremetal-arm-pod3-config-hardcode.patch)0
-rw-r--r--patches/opnfv-fuel/0012-maas-boot-resources-Add-arm64-architecture.patch (renamed from patches/opnfv-fuel/0013-maas-boot-resources-Add-arm64-architecture.patch)0
-rw-r--r--patches/opnfv-fuel/0013-libvirt-Use-libvirt-unix_sock_group.patch (renamed from patches/opnfv-fuel/0014-libvirt-Use-libvirt-unix_sock_group.patch)0
-rw-r--r--patches/opnfv-fuel/0014-mcp-salt-formulas-armband-Extend-libvirt_domain.patch (renamed from patches/opnfv-fuel/0015-mcp-salt-formulas-armband-Extend-libvirt_domain.patch)2
-rw-r--r--patches/opnfv-fuel/0015-virtng.py-virt.sls-Extend-libvirt_domain.patch (renamed from patches/opnfv-fuel/0016-virtng.py-virt.sls-Extend-libvirt_domain.patch)0
-rw-r--r--patches/opnfv-fuel/0016-mcp-salt-formulas-armband-AArch64-bootstrap.patch (renamed from patches/opnfv-fuel/0017-mcp-salt-formulas-armband-AArch64-bootstrap.patch)2
-rw-r--r--patches/opnfv-fuel/0017-seedng-module-Add-AArch64-repo.patch (renamed from patches/opnfv-fuel/0018-seedng-module-Add-AArch64-repo.patch)0
14 files changed, 4 insertions, 80 deletions
diff --git a/patches/opnfv-fuel/0000-states-network-parametrize-Openstack-public-net.patch b/patches/opnfv-fuel/0000-states-network-parametrize-Openstack-public-net.patch
deleted file mode 100644
index 4d776bcd..00000000
--- a/patches/opnfv-fuel/0000-states-network-parametrize-Openstack-public-net.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Thu, 17 Aug 2017 18:54:16 +0200
-Subject: [PATCH] states/network: parametrize Openstack public net
-
-Determine public network based on public IPs of compute nodes.
-
-Change-Id: I5a6b29a0458b0b839f8fdb3e32616a41d7a621f7
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- mcp/config/states/networks | 28 +++++++++++++++++++++++++---
- 1 file changed, 25 insertions(+), 3 deletions(-)
-
-diff --git a/mcp/config/states/networks b/mcp/config/states/networks
-index 205e0a9..6f294ce 100755
---- a/mcp/config/states/networks
-+++ b/mcp/config/states/networks
-@@ -1,3 +1,25 @@
--salt 'ctl01*' cmd.run ". /root/keystonercv3; openstack compute service list; openstack network agent list; openstack stack list; openstack volume service list"
--salt 'ctl01*' 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; openstack subnet create --gateway 10.16.0.1 --no-dhcp --allocation-pool start=10.16.0.130,end=10.16.0.254 --network floating_net --subnet-range 10.16.0.0/24 floating_subnet"
-+#!/bin/bash
-+
-+# Determine public network based on external IPs from compute node
-+# NOTE: mask currently hardcoded to /24
-+PUBLIC_NET=$(salt --out yaml 'cmp*' pillar.get _param: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=$(salt --out yaml 'cmp*' \
-+ 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"
-+
-+salt 'ctl01*' cmd.run ". /root/keystonercv3; \
-+ openstack compute service list; \
-+ openstack network agent list; \
-+ openstack stack list; \
-+ openstack volume service list"
-+salt 'ctl01*' 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; \
-+ openstack subnet create --gateway ${PUBLIC_NET%.*}.1 --no-dhcp \
-+ --allocation-pool start=${PUBLIC_NET%.*}.130,end=${PUBLIC_NET%.*}.254 \
-+ --network floating_net --subnet-range ${PUBLIC_NET} floating_subnet"
diff --git a/patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch
index 7bc8baa8..b053b699 100644
--- a/patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch
+++ b/patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch
@@ -36,7 +36,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
create mode 100644 mcp/salt-formulas/armband/vgabios.sls
diff --git a/mcp/config/states/maas b/mcp/config/states/maas
-index 52a9b77..9a27a39 100755
+index fecd991..85cee8c 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
@@ -51,6 +51,7 @@ wait_for "! salt '*' test.ping | tee /dev/stderr | fgrep -q 'Not connected'"
diff --git a/patches/opnfv-fuel/0008-mcp-config-AArch64-baremetal-Use-arm64-image.patch b/patches/opnfv-fuel/0007-mcp-config-AArch64-baremetal-Use-arm64-image.patch
index cd959da3..cd959da3 100644
--- a/patches/opnfv-fuel/0008-mcp-config-AArch64-baremetal-Use-arm64-image.patch
+++ b/patches/opnfv-fuel/0007-mcp-config-AArch64-baremetal-Use-arm64-image.patch
diff --git a/patches/opnfv-fuel/0007-states-maas-Add-mcp.rsa.pub-to-authorized_keys.patch b/patches/opnfv-fuel/0007-states-maas-Add-mcp.rsa.pub-to-authorized_keys.patch
deleted file mode 100644
index 8265abef..00000000
--- a/patches/opnfv-fuel/0007-states-maas-Add-mcp.rsa.pub-to-authorized_keys.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Tue, 22 Aug 2017 22:04:28 +0200
-Subject: [PATCH] states/maas: Add mcp.rsa.pub to authorized_keys
-
-Add our mcp.rsa.pub RSA key to all nodes, including VCP VMs.
-This is required for functest to be able to fetch openrc.
-
-While at it, add retry wrappers for more VCP VM state.sls calls.
-
-Change-Id: I34f79848c52e36de8d981055880321a081420874
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
----
- mcp/config/states/maas | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/mcp/config/states/maas b/mcp/config/states/maas
-index 52a9b77..fecd991 100755
---- a/mcp/config/states/maas
-+++ b/mcp/config/states/maas
-@@ -69,6 +69,9 @@ while [ $rc -ne 0 ]; do
- sleep 5
- done
-
--salt -C '* and not cfg01* and not mas01*' saltutil.sync_all
-+wait_for "salt -C '* and not cfg01* and not mas01*' ssh.set_auth_key ${SUDO_USER} \
-+ $(awk 'NR==1{print $2}' $(eval echo ~${SUDO_USER}/.ssh/authorized_keys))"
-+
-+wait_for "salt -C '* and not cfg01* and not mas01*' saltutil.sync_all"
- salt -C '* and not cfg01* and not mas01*' state.apply salt
- wait_for "salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp"
diff --git a/patches/opnfv-fuel/0009-classes-baremetal-AArch64-virtio-NIC-names-sync.patch b/patches/opnfv-fuel/0008-classes-baremetal-AArch64-virtio-NIC-names-sync.patch
index 045c22d0..045c22d0 100644
--- a/patches/opnfv-fuel/0009-classes-baremetal-AArch64-virtio-NIC-names-sync.patch
+++ b/patches/opnfv-fuel/0008-classes-baremetal-AArch64-virtio-NIC-names-sync.patch
diff --git a/patches/opnfv-fuel/0010-maas-Add-curtin_userdata_arm64_generic_xenial.patch b/patches/opnfv-fuel/0009-maas-Add-curtin_userdata_arm64_generic_xenial.patch
index aa521a1f..aa521a1f 100644
--- a/patches/opnfv-fuel/0010-maas-Add-curtin_userdata_arm64_generic_xenial.patch
+++ b/patches/opnfv-fuel/0009-maas-Add-curtin_userdata_arm64_generic_xenial.patch
diff --git a/patches/opnfv-fuel/0011-network-public-mgmt-Use-arm-pod3-POD-config.patch b/patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch
index 95e39265..beb90533 100644
--- a/patches/opnfv-fuel/0011-network-public-mgmt-Use-arm-pod3-POD-config.patch
+++ b/patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch
@@ -26,7 +26,7 @@ index cf7b3b3..2b4e724 100755
# Variables below are disabled for now, to be re-introduced or removed later
diff --git a/mcp/config/states/maas b/mcp/config/states/maas
-index 9a27a39..f83f4a7 100755
+index 85cee8c..46bad6f 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
@@ -20,7 +20,7 @@ salt -C 'mas01*' state.apply linux.network.interface
diff --git a/patches/opnfv-fuel/0012-classes-baremetal-arm-pod3-config-hardcode.patch b/patches/opnfv-fuel/0011-classes-baremetal-arm-pod3-config-hardcode.patch
index 229ea3a0..229ea3a0 100644
--- a/patches/opnfv-fuel/0012-classes-baremetal-arm-pod3-config-hardcode.patch
+++ b/patches/opnfv-fuel/0011-classes-baremetal-arm-pod3-config-hardcode.patch
diff --git a/patches/opnfv-fuel/0013-maas-boot-resources-Add-arm64-architecture.patch b/patches/opnfv-fuel/0012-maas-boot-resources-Add-arm64-architecture.patch
index 517dd232..517dd232 100644
--- a/patches/opnfv-fuel/0013-maas-boot-resources-Add-arm64-architecture.patch
+++ b/patches/opnfv-fuel/0012-maas-boot-resources-Add-arm64-architecture.patch
diff --git a/patches/opnfv-fuel/0014-libvirt-Use-libvirt-unix_sock_group.patch b/patches/opnfv-fuel/0013-libvirt-Use-libvirt-unix_sock_group.patch
index de3b16bd..de3b16bd 100644
--- a/patches/opnfv-fuel/0014-libvirt-Use-libvirt-unix_sock_group.patch
+++ b/patches/opnfv-fuel/0013-libvirt-Use-libvirt-unix_sock_group.patch
diff --git a/patches/opnfv-fuel/0015-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0014-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
index dda55e42..b1e675b2 100644
--- a/patches/opnfv-fuel/0015-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0014-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
@@ -21,7 +21,7 @@ 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/maas b/mcp/config/states/maas
-index f83f4a7..bc8d04f 100755
+index 46bad6f..9fe7de0 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
@@ -51,7 +51,7 @@ wait_for "! salt '*' test.ping | tee /dev/stderr | fgrep -q 'Not connected'"
diff --git a/patches/opnfv-fuel/0016-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0015-virtng.py-virt.sls-Extend-libvirt_domain.patch
index 1a64c6d6..1a64c6d6 100644
--- a/patches/opnfv-fuel/0016-virtng.py-virt.sls-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0015-virtng.py-virt.sls-Extend-libvirt_domain.patch
diff --git a/patches/opnfv-fuel/0017-mcp-salt-formulas-armband-AArch64-bootstrap.patch b/patches/opnfv-fuel/0016-mcp-salt-formulas-armband-AArch64-bootstrap.patch
index febf0943..dc8993fc 100644
--- a/patches/opnfv-fuel/0017-mcp-salt-formulas-armband-AArch64-bootstrap.patch
+++ b/patches/opnfv-fuel/0016-mcp-salt-formulas-armband-AArch64-bootstrap.patch
@@ -24,7 +24,7 @@ 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/maas b/mcp/config/states/maas
-index bc8d04f..3cea11d 100755
+index 9fe7de0..0cf4f68 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
@@ -46,6 +46,7 @@ salt -C '* and not cfg01* and not mas01*' saltutil.sync_all
diff --git a/patches/opnfv-fuel/0018-seedng-module-Add-AArch64-repo.patch b/patches/opnfv-fuel/0017-seedng-module-Add-AArch64-repo.patch
index 330d416a..330d416a 100644
--- a/patches/opnfv-fuel/0018-seedng-module-Add-AArch64-repo.patch
+++ b/patches/opnfv-fuel/0017-seedng-module-Add-AArch64-repo.patch