34 Commits

Author SHA1 Message Date
Changcheng Liu
e6ddff6eb0 puppet-ceph: osd use filestore and configured id
* integrate create filestore OSD patch
    The ceph-disk default create bluestore in mimic version.
    For maximize compability, still create filestore OSD here.

* prepare osd to be started via init script
    use osd id already configured in the database
    instead of generating a new one

* fix ceph osd disk partition for nvme disks

Story: 2003605

Depends-On: Ic9c4aed8dbab5d3e141cf9c1b2b1892731b14779
Change-Id: Iaa3319a7647e5622037d12c53673da0e4199ceb4
Co-Authored-By: Daniel Badea <daniel.badea@intel.com>
Signed-off-by: Changcheng Liu <changcheng.liu@intel.com>
Signed-off-by: Daniel Badea <daniel.badea@windriver.com>
2019-04-26 00:33:52 +00:00
Tyler Smith
9c8f0a8209 Adding patch to support new Stein version of keystone
- Adding a patch to puppet-keystone to support fernet receipts.
  without it the default /etc fernet location is used and causes
  failures

Change-Id: I49edc07c11ffd0f94b617a9de44679ecf2329d8e
Story: 2004765
Task: 28883
Depends-On: https://review.openstack.org/#/c/653086
Signed-off-by: Tyler Smith <tyler.smith@windriver.com>
2019-04-18 18:01:20 +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
Tao Liu
7c2b6fd05b Integrate Distributed Cloud with containerized services
Remove references to nova and neutron api proxy
Remove the puppet patches that are no longer required

Story: 2004766
Task: 30020

Change-Id: I38daec333dd0a47376be014b4c108d3c92e0b963
Signed-off-by: Tao Liu <tao.liu@windriver.com>
2019-03-14 14:34:26 -04:00
Zuul
be78454a52 Merge "Merge branch 'f/centos76'" 2019-03-12 01:18:36 +00:00
Al Bailey
fdb2debc3b Fix openstacklib to use openrc from platform
The old patch was using /etc/nova/openrc
The modified patch is /etc/platform/openrc

Since all the nova files are disappearing from
the controller, this needs to be updated in
order to setup keystone.

Change-Id: Ie43cf11ebf1edcf3a8bb357205c4c59d2962b4fa
Story: 2004764
Task: 29931
Signed-off-by: Al Bailey <Al.Bailey@windriver.com>
2019-03-11 07:59:03 -05:00
Al Bailey
7b58d30158 puppet-keystone was using the wrong hiera data for client
openstack::client::params was being referenced rather than
platform::client::params.

Need to fix this so that the openstack::client manifests
can be removed along with the other unwanted manifests.

Story: 2004764
Task: 29885
Change-Id: I3c1cc8673be5cf6ab15f9158199bc24fccb44f17
Signed-off-by: Al Bailey <Al.Bailey@windriver.com>
2019-03-08 09:48:59 -06:00
Saul Wold
7b3586b5f8 Merge remote-tracking branch 'gerrit/master' into f/centos76
Change-Id: If3c66a64a3b663a5af9981765cab7462dda4307e
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2019-01-22 08:33:41 -08:00
Ovidiu Poncea
6db8e31b21 Add StarlingX specific restart command for Ceph monitors
Since we don't use systemd to manage Ceph and we have pmon monitoring we
have to make sure that:
1. Restarting is properly handled as "systemctl restart" will return
   error and manifest will fail;
2. Pmon does not check ceph-mon status during restart. Otherwise we risk
   getting into a race condition between the puppet restart and pmon
   detecting that ceph is down and trying a restart.

Both are resolved when using /etc/init.d/ceph-init-wrapper restart.

Change-Id: Ie316bb611a006bbbc92ac22c52c3973cc9f15109
Co-Authored-By: Ovidiu Poncea <ovidiu.poncea@windriver.com>
Implements: containerization-2002844-CEPH-persistent-storage-backend-for-Kubernetes
Story: 2002844
Task: 28723
Signed-off-by: Ovidiu Poncea <Ovidiu.Poncea@windriver.com>
2019-01-16 17:05:57 +02:00
Zhe Hu
2547db4c7c rebase puppet-openstacklib patch to CentOS 7.6 version
Test:
Pass build and simplex deploy test

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

Story: 2004522
Task: 28401

Change-Id: I146141e040949f3f287e636d1039939d3a749bc1
Signed-off-by: Zhe Hu <zhe.hu@intel.com>
2018-12-28 11:09:10 +08:00
Tao Liu
d4fec24f6c Change compute node to worker node personality
The compute personality & subfunction has been changed to
worker, and compute_reserved.conf has been rename to
worker_reserved.conf. Compute configuration flags have
been updated to worker flags.

This update changes misc dependencies to compute
personality, compute_reserved.conf and configuration
flag files.

It aslo removed puppet-nova dependencies to
compute_reserved.conf.

Tests Performed:
Non-containerized deployment
AIO-SX: Sanity and Nightly automated test suite
AIO-DX: Sanity and Nightly automated test suite
2+2 System: Sanity and Nightly automated test suite
2+2 System: Horizon Patch Orchestration

Kubernetes deployment:
AIO-SX: Create, delete, reboot and rebuild instances
2+2+2 System: worker nodes are unlock enable and no alarms

Story: 2004022
Task: 27013

Depends-On: https://review.openstack.org/#/c/624452/

Change-Id: Iccf5584058a2154f1c4ffdb061938e76b9965861
Signed-off-by: Tao Liu <tao.liu@windriver.com>
2018-12-12 15:09:04 -05:00
Zuul
6457ac010e Merge "Provide a way to set mem_stats_period_seconds in puppet-nova." 2018-12-12 16:49:47 +00:00
Alex Kozyrev
52bef031ac Provide a way to set mem_stats_period_seconds in puppet-nova.
There is no support of mem_stats_period_seconds in puppet-nova now.
We need to add a way to set it to 0 to disable QEMU memory balloon statistics.
The intention is to help with cyclictest spikes due to stats collection.

Depends-On: Iaea1962601755736688f2deb61730ab1d548b8b1
Change-Id: I1fe3dfede1a5a07ddb5adaff1095206ffe5f6340
Closes-bug: 1803615
Signed-off-by: Alex Kozyrev <alex.kozyrev@windriver.com>
2018-12-11 14:20:44 -05:00
zhipengl
2ec4482fc7 Refactor meta patch for facter package
Merge 2 meta patches as the first meta patch is just overwritted by
second one.
Build pass!

Story: 2003768
Task: 28458

Change-Id: I02ccadafa5381c82bcace340f6c399af38aeecc7
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
2018-12-11 23:05:56 +08:00
Shuicheng Lin
4f3e626029 replace puppet-memcached srpm with rpm
This is only a version change patch which could be removed.
So replace it with rpm.

Test:
Pass build and multi node deploy test.

Story: 2004557
Task: 28317
Depends-On: https://review.openstack.org/623357

Change-Id: I1472baea4d43be2ea7ab75f3415e2fd7c36b5236
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
2018-12-07 18:36:54 +08:00
Shuicheng Lin
d3aafc9709 de-fuzz fuzzy patch in puppet-ceph
Fuzzy patch will cause potential build failure issue. Correct the
line number in patch file to de-fuzz it.

Closes-Bug: 1804561

Change-Id: Ic804485b42a789d849c7538b1991c5cc88213553
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
2018-11-22 23:54:57 +08:00
Robert Church
2994a26b9e Fix exec check which restricts ceph-prepare execution
Minor patch update to the command that checks to see if an OSD should be
erased.

The recent bug fix attempts to perform command expansion within a
literal string. This will always fail and cause the OSD to be
reformatted.

Change the single quotes to double quotes to allow the command expansion
to execute successfully.

Change-Id: I522207e7e5f7a428fb3a962ab6a13574f73bb3c9
Related-Bug: #1800889
Signed-off-by: Robert Church <robert.church@windriver.com>
2018-11-07 01:42:09 -05:00
Daniel Badea
2936d5d568 ceph-disk prepare invalid data disk value
ceph-disk prepare data OSD parameter contains a new line causing
puppet manifest to fail:

1. $data = generate('/bin/bash','-c',"/bin/readlink -f ${name}")

   is expanded together with a new line in:

   exec { $ceph_prepare:
     command   => "/usr/sbin/ceph-disk prepare ${cluster_option}
                    ${cluster_uuid_option} ${uuid_option}
                    --fs-type xfs --zap-disk ${data} ${journal}"

   just before ${journal} is expanded. Puppet reports:

     sh: line 1: : command not found

   when trying to run '' (default journal value).

2. 'readlink' should be called when running ceph-disk prepare
   command, not when the puppet resource is defined. Let
   exec's shell call readlink instead of using puppet's
   generate() . See also:

     ff2b2e6898

Added --verbose and --log-stdout options to log commands executed
by 'ceph-disk prepare' and identify where it fails.

Closes-Bug: 1800889
Change-Id: I6b71147706edb97d5a1e6579924d45b999efe98f
Signed-off-by: Daniel Badea <daniel.badea@windriver.com>
2018-10-31 19:55:26 +00:00
slin14
3fed9a53bc de-fuzz puppet-neutron 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: 26963

Change-Id: Ie799cbe503e14c7567ed601aae005114d9d71c26
Signed-off-by: slin14 <shuicheng.lin@intel.com>
2018-10-09 23:04:06 +08:00
slin14
996e35f95b de-fuzz puppet-cinder 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: 26964

Change-Id: I68d15b13496267003a6aa23b350ecf3f30a0a824
Signed-off-by: slin14 <shuicheng.lin@intel.com>
2018-10-09 23:02:50 +08:00
slin14
c745dcef93 de-fuzz puppet 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: 26965

Change-Id: I3d68b3008688d4b32957f4ba335dea5207a4be65
Signed-off-by: slin14 <shuicheng.lin@intel.com>
2018-10-09 23:01:46 +08:00
slin14
f09e564ffa de-fuzz facter 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: 26966

Change-Id: I7ec6cfad50a4b88de3f8a989fbe04dea14456114
Signed-off-by: slin14 <shuicheng.lin@intel.com>
2018-10-09 23:00:20 +08:00
Sun Austin
919da082af de-fuzz puppet-ceph patches
Problem:
- Centos 7.5 upgraded puppet-cephs.
- Porting of puppet-cephs patches did not resolve and 'fuzz' in the line
  numbers of the patches.
- If puppet-ceph 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 puppet-cephs failes due to the unexpected, and
  unpackaged .orig file

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

Story: 2003389
Task: 26755

Change-Id: I479131bd9aa5d1d8149912851180c40522ac6b1a
Signed-off-by: Sun Austin <austin.sun@intel.com>
2018-09-27 20:49:09 +08:00
Sun Austin
0c4b868072 de-fuzz puppet-horizon patches
Problem:
- Centos 7.5 upgraded puppet-horizons.
- Porting of puppet-horizons patches did not resolve and 'fuzz' in the line
  numbers of the patches.
- If puppet-horizon 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 puppet-horizons failes due to the unexpected, and
  unpackaged .orig file

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

Story: 2003389
Task: 26755

Change-Id: Ica5404ab1135dd4d0e771f2dd03e46a3c6052c53
Signed-off-by: Sun Austin <austin.sun@intel.com>
2018-09-27 20:48:22 +08:00
zhipengl
e51a4a5bbe CentOS 7.5 upgrade for puppet-haproxy package
This change can fix the issue during package upgrade that causes config_controller failed at step 6.
Root cause is that package update introduced a warning output in frontend.pp file which will cause
puppet-manifest-apply failure as it do not allow any warning existed in puppet log.

Story: 2003389
Task: 24504
Depends-On: https://review.openstack.org/#/c/600359/

Change-Id: Iabfa73e80859feeccbc1e6c81032169f94812013
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
2018-09-07 19:30:10 +08:00
Dean Troyer
e3b649669c Merge remote-tracking branch 'origin/master' into f/centos75-merge
Change-Id: Idf04b651ea1301745ad429a423b09d93543012e3
2018-09-02 15:42:07 -05:00
Zuul
76a4491c76 Merge "Revert "CentOS 7.5 upgrade for puppet-haproxy package."" into f/centos75 2018-08-31 08:19:05 +00:00
chenyan
0c0f5239b2 Revert "CentOS 7.5 upgrade for puppet-haproxy package."
This updated package will cause config_controller failed at step 6.

This reverts commit a711bc77faa6a70fbd8b29597408334b1d54e894.

Change-Id: Ib9eaad8150c13336c7a467b101f18950a6c7518e
2018-08-31 15:42:29 +08:00
chenyan
6f6345c9da CentOS 7.5 upgrade for puppet-ceph package.
Story: 2003389
Task: 24503

Change-Id: I06ee6bd6563b44c28aff7e23adf0f442466481af
Signed-off-by: chenyan <yan.chen@intel.com>
2018-08-30 14:19:00 +08:00
chenyan
a711bc77fa CentOS 7.5 upgrade for puppet-haproxy package.
0002-disable-config-validation-prechecks.patch is removed because the
  validate_cmd is already remvoed in the new src package.

Story: 2003389
Task: 24504

Change-Id: I4b56ac72577e3dc2614e545f30125cb3027c5354
Signed-off-by: chenyan <yan.chen@intel.com>
2018-08-29 09:59:35 +08:00
slin14
f51a74eed9 rebase puppet-horizon patch to CentOS7.5
Story: 2003389
Task: 24505
Depends-On: https://review.openstack.org/596989

Change-Id: I3284b46da8a82485da8fa746a242490277015fa0
Signed-off-by: slin14 <shuicheng.lin@intel.com>
2018-08-28 21:55:02 +08:00
slin14
b0f71c01c4 rebase puppet-stdlib patch to CentOS7.5
improve ipv6 support patch is removed since new src rpm has already include it.

Story: 2003389
Task: 24467
Depends-On: https://review.openstack.org/594890

Change-Id: I913e7d3b9149037a01926c927241b8dcfc28e023
Signed-off-by: slin14 <shuicheng.lin@intel.com>
2018-08-28 16:39:20 +08:00
Kristine Bujold
aea80fa088 Fix controller swact error caused by drbd resizing
Fix a bug found in ‘provider/logical_volume/lvm.rb’ in method
‘def size=(new_size)’ with the variable
‘nuke_fs_on_resize_failure’. The conditional statement was always
returning true and thus wiping bytes at the start of the volume
even is the variable was set to false.

For example resizing the extension filesystem with the command
‘system controllerfs-modify’ would cause a dd command to be
executed and erase data. This was seen in the puppet.log

Story: 2002990
Task: 23004

Change-Id: I9ce4f9869d8b72549640d1a4181df02490451a88
Signed-off-by: Kristine Bujold <kristine.bujold@windriver.com>
2018-08-15 17:31:26 -04:00
Scott Little
bab9bb6b69 Internal restructuring of stx-integ
Create new directories:
   ceph
   config
   config-files
   filesystem
   kernel
   kernel/kernel-modules
   ldap
   logging
   strorage-drivers
   tools
   utilities
   virt

Retire directories:
   connectivity
   core
   devtools
   support
   extended

Delete two packages:
   tgt
   irqbalance

Relocated packages:
   base/
      dhcp
      initscripts
      libevent
      lighttpd
      linuxptp
      memcached
      net-snmp
      novnc
      ntp
      openssh
      pam
      procps
      sanlock
      shadow
      sudo
      systemd
      util-linux
      vim
      watchdog

   ceph/
      python-cephclient

   config/
      facter
      puppet-4.8.2
      puppet-modules

   filesystem/
      e2fsprogs
      nfs-utils
      nfscheck

   kernel/
      kernel-std
      kernel-rt

   kernel/kernel-modules/
      mlnx-ofa_kernel

   ldap/
      nss-pam-ldapd
      openldap

   logging/
      syslog-ng
      logrotate

   networking/
      lldpd
      iproute
      mellanox
      python-ryu
      mlx4-config

   python/
      python-2.7.5
      python-django
      python-gunicorn
      python-setuptools
      python-smartpm
      python-voluptuous

   security/
      shim-signed
      shim-unsigned
      tboot

   strorage-drivers/
      python-3parclient
      python-lefthandclient

   virt/
      cloud-init
      libvirt
      libvirt-python
      qemu

   tools/
      storage-topology
      vm-topology

   utilities/
      tis-extensions
      namespace-utils
      nova-utils
      update-motd

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