Defuzz openstack-helm patch
Fuzzy openstack-helm patches are causing intermittent build failures when .orig files are found by the linter. ==> Linting neutron [ERROR] templates/daemonset-lb-agent.yaml.orig: file extension '.orig' not valid. Valid extensions are .yaml, .yml, .tpl, or .txt [ERROR] templates/daemonset-ovs-agent.yaml.orig: file extension '.orig' not valid. Valid extensions are .yaml, .yml, .tpl, or .txt BUILDSTDERR: Error: 1 chart(s) linted, 1 chart(s) failed BUILDSTDERR: make[1]: *** [lint-neutron] Error 1 make[1]: Leaving directory `/builddir/build/BUILD/openstack-helm' BUILDSTDERR: make: *** [neutron] Error 2 BUILDSTDERR: error: Bad exit status from /var/tmp/rpm-tmp.Sd6TYe (%build) BUILDSTDERR: Bad exit status from /var/tmp/rpm-tmp.Sd6TYe (%build) RPM build errors: This update attacks the problem in two ways. 1) Defuzz the patches 2) Add patch options to avoid creation of .orig and .rej files in a location that will be linted. Change-Id: Ifc42988984fab5225bc041704c5631ac6cd8043d Signed-off-by: Scott Little <scott.little@windriver.com>
This commit is contained in:
parent
75338d220a
commit
9736550f9b
|
@ -2,6 +2,7 @@
|
|||
%global helm_folder /usr/lib/helm
|
||||
%global toolkit_version 0.1.0
|
||||
%global helmchart_version 0.1.0
|
||||
%global _default_patch_flags --no-backup-if-mismatch --prefix=/tmp/junk
|
||||
|
||||
Summary: Openstack-Helm charts
|
||||
Name: openstack-helm
|
||||
|
|
|
@ -22,17 +22,17 @@ diff --git a/neutron/templates/daemonset-ovs-agent.yaml b/neutron/templates/daem
|
|||
index 34aba253..af765bd7 100644
|
||||
--- a/neutron/templates/daemonset-ovs-agent.yaml
|
||||
+++ b/neutron/templates/daemonset-ovs-agent.yaml
|
||||
@@ -94,6 +94,10 @@ spec:
|
||||
mountPath: /etc/neutron/neutron.conf
|
||||
@@ -95,6 +95,10 @@ spec:
|
||||
subPath: neutron.conf
|
||||
readOnly: true
|
||||
+ - name: neutron-etc
|
||||
- name: neutron-etc
|
||||
+ mountPath: {{ .Values.conf.neutron.DEFAULT.log_config_append }}
|
||||
+ subPath: {{ base .Values.conf.neutron.DEFAULT.log_config_append }}
|
||||
+ readOnly: true
|
||||
- name: neutron-etc
|
||||
+ - name: neutron-etc
|
||||
mountPath: /etc/neutron/plugins/ml2/ml2_conf.ini
|
||||
subPath: ml2_conf.ini
|
||||
readOnly: true
|
||||
--
|
||||
2.16.5
|
||||
|
||||
|
|
|
@ -120,7 +120,7 @@ diff --git a/neutron/templates/daemonset-lb-agent.yaml b/neutron/templates/daemo
|
|||
index 1c7da46..c2b432f 100644
|
||||
--- a/neutron/templates/daemonset-lb-agent.yaml
|
||||
+++ b/neutron/templates/daemonset-lb-agent.yaml
|
||||
@@ -112,6 +112,10 @@ spec:
|
||||
@@ -110,6 +110,10 @@ spec:
|
||||
subPath: neutron_sudoers
|
||||
readOnly: true
|
||||
- name: neutron-etc
|
||||
|
@ -135,7 +135,7 @@ diff --git a/neutron/templates/daemonset-ovs-agent.yaml b/neutron/templates/daem
|
|||
index e17693f..2e66844 100644
|
||||
--- a/neutron/templates/daemonset-ovs-agent.yaml
|
||||
+++ b/neutron/templates/daemonset-ovs-agent.yaml
|
||||
@@ -122,6 +122,10 @@ spec:
|
||||
@@ -120,6 +120,10 @@ spec:
|
||||
subPath: neutron_sudoers
|
||||
readOnly: true
|
||||
- name: neutron-etc
|
||||
|
@ -169,7 +169,7 @@ index a366dee..cf56ac5 100644
|
|||
interface:
|
||||
# Tunnel interface will be used for VXLAN tunneling. If null
|
||||
# (default) there is a fallback mechanism to search for interface
|
||||
@@ -1632,13 +1620,25 @@ conf:
|
||||
@@ -1649,13 +1637,25 @@ conf:
|
||||
priority: 0
|
||||
apply-to: all
|
||||
pattern: '(notifications)\.'
|
||||
|
|
|
@ -276,7 +276,7 @@ index 4edf5c6..179fb29 100755
|
|||
test: 'docker.io/kolla/ubuntu-source-rally:4.0.0'
|
||||
image_repo_sync: docker.io/docker:17.07.0
|
||||
local_registry:
|
||||
@@ -455,6 +456,14 @@ conf:
|
||||
@@ -459,6 +460,14 @@ conf:
|
||||
user: "cinder"
|
||||
keyring: null
|
||||
secret_uuid: 457eb676-33da-42ec-9a8c-9293d545c337
|
||||
|
@ -291,7 +291,7 @@ index 4edf5c6..179fb29 100755
|
|||
ssh: |
|
||||
Host *
|
||||
StrictHostKeyChecking no
|
||||
@@ -1660,6 +1669,7 @@ secrets:
|
||||
@@ -1666,6 +1675,7 @@ secrets:
|
||||
placement:
|
||||
placement:
|
||||
public: placement-tls-public
|
||||
|
@ -299,7 +299,7 @@ index 4edf5c6..179fb29 100755
|
|||
|
||||
# typically overridden by environmental
|
||||
# values, but should include all endpoints
|
||||
@@ -2233,6 +2243,13 @@ pod:
|
||||
@@ -2239,6 +2249,13 @@ pod:
|
||||
limits:
|
||||
memory: "1024Mi"
|
||||
cpu: "2000m"
|
||||
|
@ -313,7 +313,7 @@ index 4edf5c6..179fb29 100755
|
|||
|
||||
network_policy:
|
||||
nova:
|
||||
@@ -2276,6 +2293,7 @@ manifests:
|
||||
@@ -2282,6 +2299,7 @@ manifests:
|
||||
job_ks_placement_service: true
|
||||
job_ks_placement_user: true
|
||||
job_cell_setup: true
|
||||
|
|
Loading…
Reference in New Issue