12 Commits

Author SHA1 Message Date
aoliveir
abf9605f2a Remove init script from haproxy
Package haproxy-config add the haproxy init script file, but,
in the debian package it already contains the script file.
In order to avoid using dpkg-divert on haproxy-config package,
this patch was created to remove the script file from original
debian package.

Test:

PASS: built image successfully
PASS: Installed image successfully (with haproxy)
PASS: Bootstrap and unlock successfull

Story: 2009964
Task: 45036

Signed-off-by: aoliveir <adriano.oliveira@windriver.com>
Change-Id: I93e9fd0d2e80d1fd7f509aebe995547fee502229
2022-04-12 14:04:38 +00:00
Dongqi Chen
af359d4938 Add auto-versioning to starlingx/integ packages
This update makes use of the PKG_GITREVCOUNT variable
to auto-version the packages in this repo.

Story: 2007750
Task: 39951
Change-Id: I854419c922b9db4edbbf6f1e987a982ec2ec7b59
Signed-off-by: Dongqi Chen <chen.dq@neusoft.com>
2020-06-24 09:48:28 +08:00
Zhe Hu
58754f9f82 rebase haproxy patch to CentOS 7.6 version
Test:
Pass build and simplex deploy test

Depends-On: https://review.openstack.org/627929

Story: 2004522
Task: 28422

Change-Id: I41f1d629283522814941160563c242a204183593
Signed-off-by: Zhe Hu <zhe.hu@intel.com>
2019-01-02 14:29:58 +08:00
zhipengl
7754d7e95c Remove meta_remove_bad_logrotate.patch
We can do the similar change like we did in
https://review.openstack.org/#/c/620466/
Since we have duplicated log configuration,we can erase
logrotate.d/dhcp instead of remove the file with the patch.

Deployment test pass and logrotate.d/dhcp file check pass.

Story: 2004452
Task: 28131

Change-Id: Ib22fa073ca4e09af1b25854f0f1c8574f9337f3c
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
2018-12-11 20:19:00 +08:00
zhipengl
6db227d7c9 Refactor patches for haproxy package.
Use haproxy-config package to package script and service file for
haproxy package.
Create patches sub-folder and move patches file from haproxy/haproxy
folder to this sub-folder.
Refactor haproxy-service-file.patch &
haproxy-spec-add-init-script.patch
as we use haproxy-config to package related files.
Merged meta_add_support_for_tpm.patch &
spec-add-haproxy-env-var-patch.patch
to spec-include-TiS-changes.patch
(renamed from spec-include-TiS-config.patch) as they just includes
adding source code patches.

Deployment test and ping test between VMs pass
config and script files check pass.

Story: 2003768
Task: 27584
Depends-on: https://review.openstack.org/#/c/614709/

Change-Id: I08fd8aa662533f4ce379f352ba9bab7616c905f5
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
2018-11-08 01:35:53 +00:00
slin14
54ce4e46c0 de-fuzz haproxy patch
With rpm version < 4.13, patch cmd will create .orig file for fuzzy
patch in default. And this .orig file may lead to rpmbuild failure
"error: Installed (but unpackaged) file(s) found:"

Please visit below link to get more detail info:
https://bugs.launchpad.net/starlingx/+bug/1794611

Story: 2003917
Task: 26968

Change-Id: I8c18a5913e3eabc476c0ad8fdab78b71b574b70c
Signed-off-by: slin14 <shuicheng.lin@intel.com>
2018-10-09 22:56:21 +08:00
Sun Austin
f4b64998e0 de-fuzz haproxy patches
Problem:
- Centos 7.5 upgraded haproxys.
- Porting of haproxys patches did not resolve and 'fuzz' in the line
  numbers of the patches.
- If haproxy is built by rpm 4.11, or default version of rpm
  until 4.14 is compiled, a fuzzy patch results in the creating
  of an .orig file.
- Packaging of haproxys failes due to the unexpected, and
  unpackaged .orig file

Solution:
  Safest solution is to de-fuzz our haproxys patches.

Story: 2003389
Task: 26755

Change-Id: Ice3ebac4e6b7997e87dfeda72353f2bd8ca39447
Signed-off-by: Sun Austin <austin.sun@intel.com>
2018-09-28 09:05:11 +08:00
Dean Troyer
fe26a0ff84 Merge remote-tracking branch 'origin/master' into f/centos75
Change-Id: I166b99c4ce2ed458ac79ce686064ab05ad3ca198
Signed-off-by: Dean Troyer <dtroyer@gmail.com>
2018-09-15 01:18:37 -05:00
Martin Chen
dba551a518 Fix linters error and enable linters zuul gate
Fix below linters errors
E010 The "do" should be on same line as for
E010 The "do" should be on same line as while
E011 Then keyword is not on same line as if or elif keyword
E020 Function declaration not in format ^function name {$

Ignore:
E041 Arithmetic expansion using $[ is deprecated for $((
E042 local declaration hides errors
E043 Arithmetic compound has inconsistent return semantics
E044 Use [[ for non-POSIX comparisions

Story: 2003366
Task: 24423

Change-Id: I8b6b72e702d3e89d1813772d6bf16819e28e818c
Signed-off-by: Martin Chen <haochuan.z.chen@intel.com>
2018-09-07 01:50:28 +08:00
Sun Austin
847cf1e92f Fix linters issue E002 and E003 and linters check (none-voting)
E002 Tab indents
E003 Indent not multiple of 4

Story: 2003366
Task: 24424

Change-Id: Ie063ccfe346489f08c4752adaa344f5919db0378
Signed-off-by: Sun Austin <austin.sun@intel.com>
2018-08-31 04:08:52 +00:00
zhipengl
b73e432837 upgrade haproxy to CentOS 7.5 version
Story: 2003389
Task: 24498

Change-Id: I7202a163c9d864418c0f550962288467b26ec775
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
2018-08-22 23:05:27 +08:00
Scott Little
ad4ba94235 Relocate haproxy to stx-integ/base/haproxy
Move content from stx-gplv2 into stx-integ

Packages will be relocated to

stx-integ:
    base/
        bash
        cgcs-users
        cluster-resource-agents
        dpkg
        haproxy
        libfdt
        netpbm
        rpm

    database/
        mariadb

    filesystem/
        iscsi-initiator-utils

    filesystem/drbd/
        drbd-tools

    kernel/kernel-modules/
        drbd
        integrity
        intel-e1000e
        intel-i40e
        intel-i40evf
        intel-ixgbe
        intel-ixgbevf
        qat17
        tpmdd

    ldap/
        ldapscripts

    networking/
        iptables
        net-tools

Change-Id: Ia0510ab3c8879bc0ebd15261db2edaa84b346f20
Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>
2018-08-01 15:31:54 -04:00