57 Commits

Author SHA1 Message Date
Shuicheng Lin
06988b87db replace python-gunicorn srpm with rpm
For the source patch 0001-add-worker-abort-hook.patch, it is not used.
For the 3 meta patches, only 0001-TIS-gunicorn-19-upgrade.patch is
applied to srpm. And this meta patch just add tis version, and disable
python3 compilation. So it is ok to drop all these patches, and use
rpm to replace srpm.

Story: 2005484
Task: 30578
Depends-On: https://review.opendev.org/653908
Change-Id: I5805cce1dc64dd41be9f415bab985b34791f1506
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
2019-04-23 00:51:41 +00:00
Al Bailey
488942547f Remove all unused puppet modules from the build
This removes
 puppet-ceilometer
 puppet-cinder
 puppet-glance
 puppet-gnocchi
 puppet-heat
 puppet-ironic
 puppet-magnum
 puppet-murano
 puppet-neutron
 puppet-nova
 puppet-panko
 puppet-swift

Story: 2004764
Task: 30148
Change-Id: I0a037aa8f06033d3601265417fb58325f84933f1
Signed-off-by: Al Bailey <Al.Bailey@windriver.com>
2019-03-22 12:03:03 -05:00
Jerry Sun
69683e2cdc Add Docker Registry Token Server to ISO
We took the Docker registry token server out of the build a while ago
because of dependencies issues and we did not want to potentially
mess with cutover. Now that everything else is out of the way, this
commit adds the Docker registry token server back in the ISO.

Story: 2002840
Task: 22783

Change-Id: I5b11dbf8d8cad65ee3ee87be1dd4c93ab34ef3f4
Signed-off-by: Jerry Sun <jerry.sun@windriver.com>
2019-03-06 08:50:37 -05:00
Bin Qian
5d13b4c911 Set docker service monitored by pmond
override docker service so systemd:
1. to create/remove /var/run/dockerd.pid file at service start/stop.
2. not to restart automatically on exit or failure

deploy docker.conf for pmond to monitor docker service

Story: 2002843
Task: 29391

Change-Id: I3595d0d4f97d90e4119fc1455bcf164aebc5d6ec
Signed-off-by: Bin Qian <bin.qian@windriver.com>
2019-02-19 11:33:00 -05:00
Jerry Sun
bfca86f5d9 Remove Docker Registry Token Server From Build
Remove Docker Registry Token Server from build for now. Currently,
it needs network access to build, which doesn't work for some people.
Removing it from the build for now to decide how we want to rework
this.

Story: 2002840
Task: 22783

Change-Id: I7991f68288b45255ea850110ce24087297c185ca
Signed-off-by: Jerry Sun <jerry.sun@windriver.com>
2019-01-08 15:24:27 -05:00
Jerry Sun
6714d6b8d7 Add Docker Registry Token Server
As part of setting up Keystone authentication with Docker registry,
a token server needs to be deployed and managed by SM. This commit
adds the source code and spec files to build the token server used by
Docker registry for authentication with Keystone. The token server is
a modified version of the example token server provided by Docker
Distribution. The changes uses the Gophercloud library to communicate
with Keystone as opposed to checking the user credentials against an
existing HTPASSWD file.

Story: 2002840
Task: 22783
Depends-On: https://review.openstack.org/#/c/625335/

Change-Id: I00f5aa1073d496aa0b08223c6fa1fcbaf9d5b89b
Signed-off-by: Jerry Sun <jerry.sun@windriver.com>
2019-01-08 11:42:04 -05:00
zhipengl
920fcb818c Remove last patch of iscsi-initiator-utils
As we see in the patch, it changes %dir to %ghost to avoid RPM audit.
If we move the config file mod change to config package and use RPM
instead of SRPM, we have no audit issue anymore and can ignore related
change.
Deployment test pass and related file check pass!

Story: 2003768
Task: 28459
Depends-on: https://review.openstack.org/#/c/624584/

Change-Id: Ic23ccd740520e1942b3118a84cb03aef5f388332
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
2018-12-12 23:09:56 +08:00
Shuicheng Lin
be1e909e1d refactor nfs-utils
Story: 2004404
Task: 28046

since there is no src patch, move the meta patch setting to config
package. And replace srpm with rpm.
The 4 service files(rpc-statd/rpc-statd-notify) from nfs-utils are
kept to avoid rpm audit complain. Just disable them by default.
The service/conf files in files folder are not used, so just remove
them.

Test:
Pass build and multi node deploy test. Confirmed The 4 services are
disabled. Other services are the same as before.

Change-Id: I42d2ef3d61c1f62fe8aaea5467c810fc6e39dc13
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
2018-12-05 20:18:55 +08:00
zhipengl
0599e8e58e Refactor patches for setup package
Use setup-config package to package config files for setup package.
Merge all passwd, group, uidgid patches to one patch.

Deployment test and ping test between VMs pass
Config and service files check pass.

Story: 2003768
Task: 27592

Change-Id: I98da90695c8184261279b27b4ede63fd7951babf
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
2018-11-30 08:41:36 +08:00
zhipengl
96ebc7d181 Refactor patches for net-snmp package
Use net-snmp-config package to package script and service file for
net-snmp package.
Removed servcie/config/script related patches and let net-snmp-config
package be responsible for it.
Keep another meta patch for build configuration related changes.

Deployment test and ping test between VMs pass
Config,serivce and script files check pass.

Story: 2003768
Task: 27586
Depends-on: https://review.openstack.org/#/c/616097

Change-Id: Ic64543447d04543fdf9eafdc3d9ae4e2521c10df
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
2018-11-26 01:21:38 +00:00
Zuul
36dc17738d Merge "Refactor patches for openssh package" 2018-11-23 22:09:59 +00:00
Zuul
1057e52db9 Merge "Refactor patches for util-linux package" 2018-11-23 21:33:48 +00:00
Zuul
324b7e7522 Merge "refactor systemd" 2018-11-22 17:17:38 +00:00
zhipengl
3406431fc5 Refactor patches for util-linux package
Use util-linux-config package to package config files for util-linux.
Remove util-linux package folder and use RPM instead of SRPM for
util-linux.

Deployment test and ping test between VMs pass
Config file check pass.

Story: 2003768
Task: 27595
Depends-on: https://review.openstack.org/#/c/618943/

Change-Id: If90ed6df4a875a576c7ac709589ac221bb0fa2e3
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
2018-11-22 18:17:53 +08:00
Shuicheng Lin
46ce43a77d refactor systemd
Story: 2003768
Task: 27594

Package systemd-config is added to config customized config file
of systemd.
Several patches are converted to config files. These config files
are based on systemd-219-57.el7.src.rpm.
BuildRequires in system-config is set to equal "219-57.el7", to
avoid system-config is missed check when do upgrade. So when do
systemd upgrade, system-config need be upgraded also.

"0003-spec-expand-_udevrulesdir-macro.patch" is removed which
seems not needed.

Test:
Pass build and multi node deploy test. Confirmed related config
file is the same as before.

Change-Id: I879dc276f3280911d844cfa605c56ba03caabdad
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
2018-11-21 22:29:21 +08:00
zhipengl
867dddc305 Refactor patches for initscripts package
Use initscripts-config package to package script and service file for
initscripts package.
Refactor 0001-Disable-zeroconf-route.patch,
spec-add-mountnfs-init-script.patch and
spec-include-TiS-changes.patch, let initscripts-config to be
responsible for the installation of config/script/service files.
Merged some meta patches that just includes adding source code patch to
spec-include-Tis-changes.patch.
Removed base/procps since it just includes one file, sysctl.conf. And
move this file to initscripts-config folder.The monitor-tools package
in stx-integ has a %post script that is adding an entry to sysctl.conf,
so add "Requires: initscripts-config" in monitor-tools.spec, to ensure
it is installed after this package replaces the file.

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

Story: 2003768
Task: 27585

Change-Id: I2ea3bd05bdc5bca5658d157e6f40f7380e922500
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
2018-11-21 01:26:32 +00:00
zhipengl
1c8c71654f Refactor patches for openssh package
Use openssh-config package to package config and service files
for openssh package.
Merge adding source patch and spec related change to one meta
patch named spec-include-Tis-chnages.patch.

Deployment test and ping test between VMs pass
Config files check pass.

Story: 2003768
Task: 27588

Change-Id: I77cd054707d11dace1c47e8477d0e30b69719a38
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
2018-11-21 01:21:12 +00:00
zhipengl
2bd19e3f8f Refactor patches for pam package
Use pam-config package to package config files for pam package.
We can remove related patch of pam and use RPM instead of SRPM
for pam.

Deployment test and ping test between VMs pass
Config files check pass.

Story: 2003768
Task: 27589
Depends-on: https://review.openstack.org/#/c/617454/

Change-Id: Ib19aa8ef023c184c7dcf0e4086adb516be0d947d
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
2018-11-20 18:21:35 +08:00
Zuul
de1994430a Merge "refactor lighttpd" 2018-11-20 01:17:57 +00:00
Zuul
0cf86be2a6 Merge "refactor openldap" 2018-11-20 01:15:18 +00:00
slin14
822420e2d3 refactor openldap
Package openldap-config is added to config customized config file
of openldap.

Here is the customized change in slapd.service:
"
-After=syslog.target network-online.target
+Before=rsyncd.service
+After=network.target syslog-ng.target

-PIDFile=/var/run/openldap/slapd.pid
+PIDFile=/var/run/slapd.pid

-ExecStart=/usr/sbin/slapd -u ldap -h ${SLAPD_URLS} $SLAPD_OPTIONS
+ExecStart=/etc/init.d/openldap start
+ExecStop=/etc/init.d/openldap stop
+ExecReload=/etc/init.d/openldap restart
+RemainAfterExit=yes
"
Here is the customized change in slapd.sysconfig:
"
-#SLAPD_OPTIONS=""
+SLAPD_OPTIONS=""
"

Test:
Pass build and multi node deploy test. Confirmed related config
file is the same as before in deploy node.

Story: 2003768
Task: 26462
Depends-On: https://review.openstack.org/618440

Change-Id: I2559a8e43619449d6179ed913181052d653fa91d
Signed-off-by: slin14 <shuicheng.lin@intel.com>
2018-11-19 23:29:42 +08:00
Zuul
3ba13e2316 Merge "Refactor patches for rsync package" 2018-11-19 15:19:35 +00:00
Zuul
a83618f0fd Merge "Refactor patches for iscsi-initiator-utils package" 2018-11-19 15:19:33 +00:00
zhipengl
9a10fe4a2f Refactor patches for rsync package
Use rsync-config package to package rsyncd.conf file for rsync
package.
Remove rsync package folder and use RPM instead of SRPM for rsync.

Deployment test and ping test between VMs pass
Config file check pass.

Story: 2003768
Task: 27590
Depends-on: https://review.openstack.org/#/c/617447/

Change-Id: Ic5aeec585774917bb4b25c08fe1a4fa5a3e7d77c
2018-11-19 18:58:45 +08:00
Zuul
4046c2ca47 Merge "refactor iptables" 2018-11-19 01:28:36 +00:00
Zuul
efd96cd34c Merge "refactor syslog-ng" 2018-11-19 01:28:20 +00:00
zhipengl
335a519863 Refactor patches for iscsi-initiator-utils package
Use iscsi-initiator-utils-config package to package config and
service file for iscsi-initiator-utils package.

Deployment test and ping test between WMs pass
Config and service files check pass.

Story: 2003768
Task: 27596

Change-Id: I6512171f1c9186018c0af15b15e7d2094e3d7a73
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
2018-11-18 01:01:24 +00:00
Zuul
ceeef34525 Merge "refactor openvswitch" 2018-11-16 16:04:34 +00:00
slin14
2b5e63bc40 refactor iptables
Package iptables-config is created for iptables customized
config file. And there is no other change for iptables, so
we could replace iptables srpm with rpm directly.

iptables-config is set to depends on iptables, so iptables
could be installed automatically.

Test:
Pass build and multi node deploy test. Confirm iptables
config file is the same as before.

Story: 2003768
Task: 27600
Depends-On: https://review.openstack.org/617170

Change-Id: I08daae6f53de43688e9edb2506398e3391589fe0
Signed-off-by: slin14 <shuicheng.lin@intel.com>
2018-11-16 18:28:17 +08:00
slin14
368940f773 refactor lighttpd
Package lighttpd-config is added to config customized config
file of lighttpd.

lighttpd-csr.conf is removed, since it is not used in build.
Patches in files folder are moved to patches folder.

Test:
Pass build and multi node deploy test. Confirmed related config
file is the same as before in deploy.

Story: 2003768
Task: 27616
Depends-On: https://review.openstack.org/617221

Change-Id: I9155542754985429f06fa569f3644009a39ab8c1
Signed-off-by: slin14 <shuicheng.lin@intel.com>
2018-11-16 03:56:03 +00:00
Zuul
7725b83a95 Merge "refactor audit" 2018-11-16 03:04:42 +00:00
slin14
fe18cbb7ca refactor openvswitch
Package openvswitch-config is created to install customized
config file of openvswitch.

Test:
Pass build and multi node deploy test. Confirmed the config file
in compute node is the same as before.

Story: 2003768
Task: 27601
Depends-On: https://review.openstack.org/616776

Change-Id: I004bf349ef13707e7c664cc1b4fd76e72d9c8eac
Signed-off-by: slin14 <shuicheng.lin@intel.com>
2018-11-13 05:21:06 +08:00
slin14
be3514e25c refactor audit
Package audit-config is created to config customized config
file of audit. Since there is no other change for audit,
we could replace srpm with rpm directly.

audit-config is set to depends on audit, so audit rpm will be
installed automatically.

Test:
Pass build and multi node deploy test. Confirm syslog.conf is
the same as before in the deploy.

Story: 2003768
Task: 27602
Depends-On: https://review.openstack.org/617174

Change-Id: I6101142642dd21c35e7db1352cc8c9aa05fba923
Signed-off-by: slin14 <shuicheng.lin@intel.com>
2018-11-12 19:51:58 +08:00
Zuul
afb2aabe13 Merge "Refactor patches for haproxy package." 2018-11-12 10:07:08 +00:00
Zuul
16ccd917c4 Merge "Refactor patches for dnsmasq package." 2018-11-12 10:01:37 +00:00
Zuul
4ab916f4fb Merge "refactor logrotate" 2018-11-12 09:54:29 +00:00
slin14
fc4a7c9d49 refactor syslog-ng
Package syslog-ng-config is created to install customized
config file of syslog-ng. Since there is no source code change
in syslog-ng, we could replace the srpm with rpm directly.

syslog-ng-config is set to depends on syslog-ng. So syslog-ng
will be installed automatically.

Test:
Pass build and basic deploy test. Confirmed the related config
file is the same as before.

Story: 2003768
Task: 27599
Depends-On: https://review.openstack.org/616720

Change-Id: I2a4e15b9ffde92aa59072d590de2b56d239e29ad
Signed-off-by: slin14 <shuicheng.lin@intel.com>
2018-11-09 19:35:54 +08:00
Zuul
15c9ab7548 Merge "refactor ntp" 2018-11-08 21:41:07 +00:00
Zuul
d0be25375d Merge "refactor shadow-utils" 2018-11-08 21:41:05 +00:00
slin14
7880e6f1a1 refactor logrotate
Package logrotate-config is created to config logrotate.conf
and logrotate.cron for logrotate.

Pass build and basic deploy test. And confirmed logrotate.conf
and logrotate.cron is the same as before.

Story: 2003768
Task: 27598

Change-Id: I4792366018f7c4d4960bf1182c8c2ffee5625676
Signed-off-by: slin14 <shuicheng.lin@intel.com>
2018-11-08 21:07:33 +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
644cb5ffa8 refactor ntp
Add ntp-config package to config the customized ntp.conf and ntpd.
With this change, ntp srpm is dropped to replaced by rpm.
ntp-config is configured to depend on ntp, so ntp will be included
in the ISO automatically.
ntp package will be installed in all type node, so no change to filter.

Test has been done:
build and deploy with multinode. confirm ntp.conf and ntpd is kept
the same as before.

Story: 2003768
Task: 27587

Change-Id: I795f0fd2b53c46c7302104a07c5d4cfe869d3c7b
Signed-off-by: slin14 <shuicheng.lin@intel.com>
2018-11-07 18:32:28 +08:00
zhipengl
992c3dfdf7 Refactor patches for dnsmasq package.
Use dnsmasq-config package to add init script to system folder
Remove dnsmasq-spec-add-init-script.patch.
Merge spec change part in dnsmasq-spec-add-init-script.patch
and src patch adding in patch-tftp-to-close-sockets-immediately.patch
to spec-include-TiS-patch.patch.
Deployment test and script check pass.

Story: 2003768
Task: 27583

Change-Id: I4d5b78fed03961056585b8c09dc483fac3b55728
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
2018-11-07 01:23:49 +00:00
Jason McKenna
874cdf0820 Add python2-ruamel-yaml to controllers
This change adds the package to the list of files included on the
ISO and installed on nodes be default.

Depends-On:  https://review.openstack.org/615923
Change-Id: Ie42771672d867140728905bce7b011f7f375cfd3
Signed-off-by: Jason McKenna <jason.mckenna@windriver.com>
Story: 2004240
Task: 27763
2018-11-06 11:13:39 -05:00
slin14
90373272b8 refactor shadow-utils
The refactor task is to eliminate patch which is relate to configure
file modification. And we could replace srpm with rpm if all patches
could be eliminated, which will help save build time.
To eliminate the patch, a new config package or puppet file will be
created to do the configure file modification. Here is the general
guide for the refactor process:
https://review.openstack.org/612292

For shadow-utils, the configure file is moved to shadow-utils-config
package, so src rpm is replaced with rpm.
shadow-utils-config is configured to depend on shadow-utils, so
shadow-utils rpm will be picked automatically in ISO build.
File clear_shadow_locks and su under files folder is not used in build,
so just delete them.

This patch should has no function change from end user view.
Test has been done:
Done build and deploy test, and confirm login.defs and
clear_shadow_locks.service in the deploy node are the same as before.

Story: 2003768
Task: 27593

Change-Id: Ie62800c64aca54c39950266f8cf36e47cc1f55bd
Signed-off-by: slin14 <shuicheng.lin@intel.com>
2018-11-02 20:58:15 +08:00
Zuul
5664d8cc04 Merge "Refactor patches for dhcp package." 2018-11-02 02:12:17 +00:00
Zuul
913834f8f1 Merge "Remove service config file patch for nfs-utils." 2018-11-02 02:09:03 +00:00
zhipengl
1305fcc31a Remove service config file patch for nfs-utils.
Use nfs-utils-config package to package service and config files for nfs-utils

Story: 2003768
Task: 26461

Change-Id: Id24669ea5f7b7dadff025208e7f7f07f179c1490
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
2018-11-02 01:53:04 +00:00
zhipengl
9c13b8b88e Move memcached changes from platform-utils
Use mecached-custom package to package service file to system
folder instead of platform-utils.
Basic deployment test pass and service file status check pass.

Story: 2004108
Task: 27517
Depends-on: https://review.openstack.org/#/c/614085/

Change-Id: Ic66f077159be2f21caa6e8e68241aae65b9f2245
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
2018-11-02 01:48:23 +00:00
zhipengl
1232ac58be Remove config patch and use RPM instead of SRPM for centos-release
Use centos-release-config package to package issue and issue.net to target folder.
Then we can remove related patch of centos-release and use RPM instead of SRPM
for centos-release.

Story: 2003768
Task: 27581
Depends-on: https://review.openstack.org/#/c/613236/

Change-Id: If2321fa4dc55d57eb7a993bf2798092e8d2af6dd
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
2018-11-01 01:36:32 +00:00