starlingx
/
integ
Code Issues Proposed changes

Merge "Remove all unused puppet modules from the build"

This commit is contained in:
Zuul 2019-03-22 17:59:43 +00:00 committed by Gerrit Code Review
parent 2d0b003e8c 488942547f
commit c9ce9d57ab
128 changed files with 2 additions and 6175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
centos_iso_image.inc
View File

@ -264,9 +264,6 @@ python-perf
# puppet
puppet
# puppet-gnocchi
puppet-gnocchi
# systemd
systemd
systemd-config

16
centos_pkg_dirs
View File

@ -65,35 +65,23 @@ config/puppet-modules/puppet-puppi
config/puppet-modules/puppet-rabbitmq-5.5.0
config/puppet-modules/puppet-staging
config/puppet-modules/puppet-stdlib-4.12.0
config/puppet-modules/openstack/puppet-ceilometer-11.3.0
config/puppet-modules/openstack/puppet-ceph-2.2.0
config/puppet-modules/openstack/puppet-cinder-11.3.0
config/puppet-modules/openstack/puppet-glance-11.3.0
config/puppet-modules/openstack/puppet-gnocchi-11.3.0
config/puppet-modules/openstack/puppet-heat-11.3.0
config/puppet-modules/openstack/puppet-ironic-11.3.0
config/puppet-modules/openstack/puppet-horizon-9.5.0
config/puppet-modules/openstack/puppet-keystone-11.3.0
config/puppet-modules/openstack/puppet-murano-11.3.0
config/puppet-modules/openstack/puppet-magnum-11.3.0
config/puppet-modules/openstack/puppet-neutron-11.3.0
config/puppet-modules/openstack/puppet-nova-11.4.0
config/puppet-modules/openstack/puppet-openstacklib-11.3.0
config/puppet-modules/openstack/puppet-panko-11.3.0
config/puppet-modules/openstack/puppet-oslo-11.3.0
utilities/tis-extensions
python/python-eventlet
python/python-requests
base/systemd
base/systemd-config
python/python-gunicorn
config/puppet-modules/openstack/puppet-oslo-11.3.0
storage-drivers/python-3parclient
storage-drivers/python-lefthandclient
security/tboot
networking/mellanox/libibverbs
kernel/kernel-modules/mlnx-ofa_kernel
networking/mellanox/rdma-core
config/puppet-modules/openstack/puppet-horizon-9.5.0
config/puppet-modules/openstack/puppet-swift-11.3.0
monitoring/collectd-extensions
monitoring/influxdb-extensions
kubernetes/kubernetes

1
config/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/build_srpm.data
View File

@ -1 +0,0 @@
TIS_PATCH_VER=3

25
config/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
View File

@ -1,25 +0,0 @@
From 6098a4fc06f27ce855fe777afb50b13e23f11e27 Mon Sep 17 00:00:00 2001
From: Don Penney <don.penney@windriver.com>
Date: Tue, 3 Jan 2017 13:44:33 -0500
Subject: [PATCH] Update package versioning for TIS format
---
SPECS/puppet-ceilometer.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/puppet-ceilometer.spec b/SPECS/puppet-ceilometer.spec
index 76697c4..6b3a1b4 100644
--- a/SPECS/puppet-ceilometer.spec
+++ b/SPECS/puppet-ceilometer.spec
@@ -1,7 +1,7 @@
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
Name: puppet-ceilometer
Version: 11.3.0
-Release: 1%{?dist}
+Release: 1.el7%{?_tis_dist}.%{tis_patch_ver}
Summary: Puppet module for OpenStack Ceilometer
License: ASL 2.0
--
1.8.3.1

33
config/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/meta_patches/0002-Add-Rebase-Patches.patch
View File

@ -1,33 +0,0 @@
From e2c17352768be4f66a5769876e78d0ba28c8abad Mon Sep 17 00:00:00 2001
From: Al Bailey <Al.Bailey@windriver.com>
Date: Tue, 14 Nov 2017 09:51:47 -0600
Subject: [PATCH] Add Rebase Patches
---
SPECS/puppet-ceilometer.spec | 3 +++
1 file changed, 3 insertions(+)
diff --git a/SPECS/puppet-ceilometer.spec b/SPECS/puppet-ceilometer.spec
index 5f93f86..a869999 100644
--- a/SPECS/puppet-ceilometer.spec
+++ b/SPECS/puppet-ceilometer.spec
@@ -9,6 +9,8 @@ URL: https://launchpad.net/puppet-ceilometer
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz
+Patch0001: 0001-Roll-up-TIS-patches.patch
+
BuildArch: noarch
Requires: puppet-apache
@@ -24,6 +26,7 @@ Puppet module for OpenStack Ceilometer
%prep
%setup -q -n openstack-ceilometer-%{upstream_version}
+%patch0001 -p1
find . -type f -name ".*" -exec rm {} +
find . -size 0 -exec rm {} +
--
1.8.3.1

32
config/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/meta_patches/0003-meta-fix-ceilometer-puppet-warnings.patch
View File

@ -1,32 +0,0 @@
From 5ecbc776a6fdbd7065b6145c7fd82c03217b8205 Mon Sep 17 00:00:00 2001
From: Angie Wang <Angie.Wang@windriver.com>
Date: Mon, 29 Jan 2018 14:20:19 -0500
Subject: [PATCH 1/1] meta fix ceilometer puppet warnings
---
SPECS/puppet-ceilometer.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/puppet-ceilometer.spec b/SPECS/puppet-ceilometer.spec
index a869999..5356f91 100644
--- a/SPECS/puppet-ceilometer.spec
+++ b/SPECS/puppet-ceilometer.spec
@@ -10,6 +10,7 @@ URL: https://launchpad.net/puppet-ceilometer
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz
Patch0001: 0001-Roll-up-TIS-patches.patch
+Patch0002: 0002-Fix-ceilometer-puppet-warnings.patch
BuildArch: noarch
@@ -27,6 +28,7 @@ Puppet module for OpenStack Ceilometer
%prep
%setup -q -n openstack-ceilometer-%{upstream_version}
%patch0001 -p1
+%patch0002 -p1
find . -type f -name ".*" -exec rm {} +
find . -size 0 -exec rm {} +
--
1.8.3.1

32
config/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/meta_patches/0004-meta-remove-reseller-admin-role.patch
View File

@ -1,32 +0,0 @@
From 5593efe4967eb528da3e7acbd6e693f6a5b0f7c5 Mon Sep 17 00:00:00 2001
From: Angie Wang <Angie.Wang@windriver.com>
Date: Tue, 17 Apr 2018 13:15:49 -0400
Subject: [PATCH 1/1] meta remove reseller admin role
---
SPECS/puppet-ceilometer.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/puppet-ceilometer.spec b/SPECS/puppet-ceilometer.spec
index 5356f91..9f291f9 100644
--- a/SPECS/puppet-ceilometer.spec
+++ b/SPECS/puppet-ceilometer.spec
@@ -11,6 +11,7 @@ Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_versio
Patch0001: 0001-Roll-up-TIS-patches.patch
Patch0002: 0002-Fix-ceilometer-puppet-warnings.patch
+Patch0003: 0003-remove-reseller-admin-role.patch
BuildArch: noarch
@@ -29,6 +30,7 @@ Puppet module for OpenStack Ceilometer
%setup -q -n openstack-ceilometer-%{upstream_version}
%patch0001 -p1
%patch0002 -p1
+%patch0003 -p1
find . -type f -name ".*" -exec rm {} +
find . -size 0 -exec rm {} +
--
1.8.3.1

32
config/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/meta_patches/0005-meta-remove-the-oslo-cache-configuration.patch
View File

@ -1,32 +0,0 @@
From 0a5156ce7ebf44b0013dfb3f9ef3c27c000e91f1 Mon Sep 17 00:00:00 2001
From: Angie Wang <angie.Wang@windriver.com>
Date: Mon, 4 Jun 2018 10:48:56 -0400
Subject: [PATCH 1/1] meta remove the oslo cache configuration
---
SPECS/puppet-ceilometer.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/puppet-ceilometer.spec b/SPECS/puppet-ceilometer.spec
index 9f291f9..df9d728 100644
--- a/SPECS/puppet-ceilometer.spec
+++ b/SPECS/puppet-ceilometer.spec
@@ -12,6 +12,7 @@ Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_versio
Patch0001: 0001-Roll-up-TIS-patches.patch
Patch0002: 0002-Fix-ceilometer-puppet-warnings.patch
Patch0003: 0003-remove-reseller-admin-role.patch
+Patch0004: 0004-remove-the-oslo-cache-configuration.patch
BuildArch: noarch
@@ -31,6 +32,7 @@ Puppet module for OpenStack Ceilometer
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
+%patch0004 -p1
find . -type f -name ".*" -exec rm {} +
find . -size 0 -exec rm {} +
--
1.8.3.1

5
config/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/meta_patches/PATCH_ORDER
View File

@ -1,5 +0,0 @@
0001-Update-package-versioning-for-TIS-format.patch
0002-Add-Rebase-Patches.patch
0003-meta-fix-ceilometer-puppet-warnings.patch
0004-meta-remove-reseller-admin-role.patch
0005-meta-remove-the-oslo-cache-configuration.patch

63
config/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/patches/0001-Roll-up-TIS-patches.patch
View File

@ -1,63 +0,0 @@
From ce72dedc948691a25848829798c8a4afd1a380d0 Mon Sep 17 00:00:00 2001
From: Al Bailey <Al.Bailey@windriver.com>
Date: Tue, 14 Nov 2017 09:48:56 -0600
Subject: [PATCH] Roll up WRS patches to pike
---
manifests/db/sync.pp | 3 +++
manifests/expirer.pp | 2 +-
manifests/params.pp | 4 ++--
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp
index db08f6d..7c9ab55 100644
--- a/manifests/db/sync.pp
+++ b/manifests/db/sync.pp
@@ -29,6 +29,9 @@ class ceilometer::db::sync(
Anchor['ceilometer::config::end'],
Anchor['ceilometer::dbsync::begin']
],
+ # Only do the db sync if both controllers are running the same software
+ # version. Avoids impacting mate controller during an upgrade.
+ onlyif => "test $::controller_sw_versions_match = true",
notify => Anchor['ceilometer::dbsync::end'],
}
diff --git a/manifests/expirer.pp b/manifests/expirer.pp
index b69db8a..66847c5 100644
--- a/manifests/expirer.pp
+++ b/manifests/expirer.pp
@@ -65,7 +65,7 @@ class ceilometer::expirer (
ensure => $ensure,
command => $ceilometer::params::expirer_command,
environment => 'PATH=/bin:/usr/bin:/usr/sbin SHELL=/bin/sh',
- user => 'ceilometer',
+ user => 'root',
minute => $minute,
hour => $hour,
monthday => $monthday,
diff --git a/manifests/params.pp b/manifests/params.pp
index 4550dbd..456d8f9 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -7,7 +7,7 @@ class ceilometer::params {
include ::openstacklib::defaults
$dbsync_command = 'ceilometer-upgrade'
- $expirer_command = 'ceilometer-expirer'
+ $expirer_command = '/usr/bin/ceilometer-expirer-active'
$user = 'ceilometer'
$event_pipeline = '/etc/ceilometer/event_pipeline.yaml'
$pipeline = '/etc/ceilometer/pipeline.yaml'
@@ -33,7 +33,7 @@ class ceilometer::params {
$agent_notification_service_name = 'openstack-ceilometer-notification'
$ceilometer_wsgi_script_path = '/var/www/cgi-bin/ceilometer'
$ceilometer_wsgi_script_source = '/usr/lib/python2.7/site-packages/ceilometer/api/app.wsgi'
- $libvirt_group = undef
+ $libvirt_group = 'libvirt'
}
'Debian': {
# package names
--
1.8.3.1

39
config/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/patches/0002-Fix-ceilometer-puppet-warnings.patch
View File

@ -1,39 +0,0 @@
From c0061b1c127860b0a1a4d4a235094eb6c4fe6160 Mon Sep 17 00:00:00 2001
From: Angie Wang <Angie.Wang@windriver.com>
Date: Mon, 29 Jan 2018 12:56:00 -0500
Subject: [PATCH 1/1] Fix ceilometer puppet warnings
---
manifests/api.pp | 2 +-
manifests/collector.pp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/manifests/api.pp b/manifests/api.pp
index 7a253c4..189fcfd 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -62,7 +62,7 @@ class ceilometer::api (
include ::ceilometer::params
include ::ceilometer::policy
- warning('ceilometer-api has been deprecated in Ocata and will be removed in future. Please use Aodh, Gnocchi and Panko modules instead.')
+ # warning('ceilometer-api has been deprecated in Ocata and will be removed in future. Please use Aodh, Gnocchi and Panko modules instead.')
if $auth_strategy == 'keystone' {
include ::ceilometer::keystone::authtoken
diff --git a/manifests/collector.pp b/manifests/collector.pp
index eb5b4f7..11cc4ab 100644
--- a/manifests/collector.pp
+++ b/manifests/collector.pp
@@ -68,7 +68,7 @@ class ceilometer::collector (
include ::ceilometer::deps
include ::ceilometer::params
- warning('This class is deprecated. Now the pipeline.yaml can be configured directly to send data eg: gnocchi://')
+ # warning('This class is deprecated. Now the pipeline.yaml can be configured directly to send data eg: gnocchi://')
# We accept udp_address to be set to empty instead of the usual undef to stay
# close to the "strange" upstream interface.
--
1.8.3.1

37
config/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/patches/0003-remove-reseller-admin-role.patch
View File

@ -1,37 +0,0 @@
From f257ef739b3d2593ed4613f9661f97d0228188bd Mon Sep 17 00:00:00 2001
From: Angie Wang <Angie.Wang@windriver.com>
Date: Tue, 17 Apr 2018 11:54:19 -0400
Subject: [PATCH 1/1] remove reseller admin role
---
manifests/keystone/auth.pp | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp
index a9abe8c..1aa91ad 100644
--- a/manifests/keystone/auth.pp
+++ b/manifests/keystone/auth.pp
@@ -103,20 +103,10 @@ class ceilometer::keystone::auth (
password => $password,
email => $email,
tenant => $tenant,
- roles => ['admin', 'ResellerAdmin'],
public_url => $public_url,
admin_url => $admin_url,
internal_url => $internal_url,
}
- if $configure_user_role {
- if !defined(Keystone_role['ResellerAdmin']) {
- keystone_role { 'ResellerAdmin':
- ensure => present,
- }
- }
- Keystone_role['ResellerAdmin'] -> Keystone_user_role["${auth_name}@${tenant}"]
- }
-
}
--
1.8.3.1

25
config/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/patches/0004-remove-the-oslo-cache-configuration.patch
View File

@ -1,25 +0,0 @@
From 26ea115cb4af960dce65b9580178d69a99129448 Mon Sep 17 00:00:00 2001
From: Angie Wang <angie.Wang@windriver.com>
Date: Mon, 4 Jun 2018 10:45:48 -0400
Subject: [PATCH 1/1] remove the oslo cache configuration
---
manifests/init.pp | 4 ----
1 file changed, 4 deletions(-)
diff --git a/manifests/init.pp b/manifests/init.pp
index 9c48627..3598b73 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -453,8 +453,4 @@ please use memcache_servers instead.")
rpc_response_timeout => $rpc_response_timeout,
control_exchange => $control_exchange,
}
-
- oslo::cache { 'ceilometer_config':
- memcache_servers => $memcache_servers_real,
- }
}
--
1.8.3.1

1
config/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/srpm_path
View File

@ -1 +0,0 @@
mirror:Source/puppet-ceilometer-11.3.0-1.el7.src.rpm

1
config/puppet-modules/openstack/puppet-cinder-11.3.0/centos/build_srpm.data
View File

@ -1 +0,0 @@
TIS_PATCH_VER=7

25
config/puppet-modules/openstack/puppet-cinder-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
View File

@ -1,25 +0,0 @@
From a140bd7cdc5bdac336619544141aa64daf54590a Mon Sep 17 00:00:00 2001
From: Daniel Badea <daniel.badea@windriver.com>
Date: Tue, 31 Oct 2017 16:00:04 +0200
Subject: [PATCH] Update package versioning for TIS format
---
SPECS/puppet-cinder.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/puppet-cinder.spec b/SPECS/puppet-cinder.spec
index 6af9d49..f9089b6 100644
--- a/SPECS/puppet-cinder.spec
+++ b/SPECS/puppet-cinder.spec
@@ -1,7 +1,7 @@
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
Name: puppet-cinder
Version: 11.3.0
-Release: 1%{?dist}
+Release: 1.el7%{?_tis_dist}.%{tis_patch_ver}
Summary: Puppet module for OpenStack Cinder
License: ASL 2.0
--
2.7.4

32
config/puppet-modules/openstack/puppet-cinder-11.3.0/centos/meta_patches/0002-Add-TIS-patches.patch
View File

@ -1,32 +0,0 @@
From b7c5f47cef3c82667014e94f879b6bef943c7e71 Mon Sep 17 00:00:00 2001
From: Daniel Badea <daniel.badea@windriver.com>
Date: Tue, 31 Oct 2017 16:14:27 +0200
Subject: [PATCH] Add TIS patches
---
SPECS/puppet-cinder.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/puppet-cinder.spec b/SPECS/puppet-cinder.spec
index f9089b6..e2e073e 100644
--- a/SPECS/puppet-cinder.spec
+++ b/SPECS/puppet-cinder.spec
@@ -8,6 +8,7 @@ License: ASL 2.0
URL: https://launchpad.net/puppet-cinder
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz
+Patch0001: 0001-Roll-up-TIS-patches.patch
BuildArch: noarch
@@ -24,6 +25,7 @@ Puppet module for OpenStack Cinder
%prep
%setup -q -n openstack-cinder-%{upstream_version}
+%patch0001 -p1
find . -type f -name ".*" -exec rm {} +
find . -size 0 -exec rm {} +
--
2.7.4

40
config/puppet-modules/openstack/puppet-cinder-11.3.0/centos/meta_patches/0003-CGTS-8837-cinder-volume-cannot-be-deleted-after-swact.patch
View File

@ -1,40 +0,0 @@
From 936518067804b9570e4ccbc95bdc519333b68de4 Mon Sep 17 00:00:00 2001
From: Daniel Badea <daniel.badea@windriver.com>
Date: Wed, 31 Jan 2018 14:10:02 +0000
Subject: [PATCH] CGTS-8837 cinder volume cannot be deleted after swact
Using cinder::host causes a deprecation warning in puppet. After
switching to cinder::backend_host and locking/unlocking controller
followed by swact cinder volumes cannot be deleted anymore. This
happens because CONF.host is still used by cinder services (not
entirey replaced with CONF.backend_host).
Set cinder config DEFAULT/host to cinder::host if defined or
cinder::backend_host otherwise.
---
SPECS/puppet-cinder.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/puppet-cinder.spec b/SPECS/puppet-cinder.spec
index e2e073e..bf848da 100644
--- a/SPECS/puppet-cinder.spec
+++ b/SPECS/puppet-cinder.spec
@@ -9,6 +9,7 @@ URL: https://launchpad.net/puppet-cinder
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz
Patch0001: 0001-Roll-up-TIS-patches.patch
+Patch0002: 0002-CGTS-8837-cinder-volume-cannot-be-deleted-after-swact.patch
BuildArch: noarch
@@ -26,6 +27,7 @@ Puppet module for OpenStack Cinder
%prep
%setup -q -n openstack-cinder-%{upstream_version}
%patch0001 -p1
+%patch0002 -p1
find . -type f -name ".*" -exec rm {} +
find . -size 0 -exec rm {} +
--
1.8.3.1

33
config/puppet-modules/openstack/puppet-cinder-11.3.0/centos/meta_patches/0004-CGTS-9191-Fix-cinder-calling-nova-over-public-ip.patch
View File

@ -1,33 +0,0 @@
From 743a3c2650c541543b5741c0315bce6ef3b59491 Mon Sep 17 00:00:00 2001
From: Ovidiu Poncea <ovidiu.poncea@windriver.com>
Date: Thu, 22 Mar 2018 05:18:06 -0400
Subject: [PATCH] CGTS-9191: Fix cinder calling nova over public ip
Using public ip leads to SSL certificate failures on HTTPS enabled deployments.
---
SPECS/puppet-cinder.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/puppet-cinder.spec b/SPECS/puppet-cinder.spec
index bf848da..9d03ef3 100644
--- a/SPECS/puppet-cinder.spec
+++ b/SPECS/puppet-cinder.spec
@@ -10,6 +10,7 @@ URL: https://launchpad.net/puppet-cinder
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz
Patch0001: 0001-Roll-up-TIS-patches.patch
Patch0002: 0002-CGTS-8837-cinder-volume-cannot-be-deleted-after-swact.patch
+Patch0003: 0003-CGTS-9191-Add-nova-interface-config-option.patch
BuildArch: noarch
@@ -28,6 +29,7 @@ Puppet module for OpenStack Cinder
%setup -q -n openstack-cinder-%{upstream_version}
%patch0001 -p1
%patch0002 -p1
+%patch0003 -p1
find . -type f -name ".*" -exec rm {} +
find . -size 0 -exec rm {} +
--
1.8.3.1

32
config/puppet-modules/openstack/puppet-cinder-11.3.0/centos/meta_patches/0005-Patch-for-removal-of-default_volume_type-from-API.patch
View File

@ -1,32 +0,0 @@
From e8f063bfcd6ea5609c043e45608abd2b7727e580 Mon Sep 17 00:00:00 2001
From: Robert Church <robert.church@windriver.com>
Date: Mon, 9 Apr 2018 11:14:52 -0500
Subject: Patch for removal of default_volume_type from API
---
SPECS/puppet-cinder.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/puppet-cinder.spec b/SPECS/puppet-cinder.spec
index 9d03ef3..af02638 100644
--- a/SPECS/puppet-cinder.spec
+++ b/SPECS/puppet-cinder.spec
@@ -11,6 +11,7 @@ Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_versio
Patch0001: 0001-Roll-up-TIS-patches.patch
Patch0002: 0002-CGTS-8837-cinder-volume-cannot-be-deleted-after-swact.patch
Patch0003: 0003-CGTS-9191-Add-nova-interface-config-option.patch
+Patch0004: 0004-CGTS-9219-Remove-default_volume_type-from-api-class.patch
BuildArch: noarch
@@ -30,6 +31,7 @@ Puppet module for OpenStack Cinder
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
+%patch0004 -p1
find . -type f -name ".*" -exec rm {} +
find . -size 0 -exec rm {} +
--
2.7.4

5
config/puppet-modules/openstack/puppet-cinder-11.3.0/centos/meta_patches/PATCH_ORDER
View File

@ -1,5 +0,0 @@
0001-Update-package-versioning-for-TIS-format.patch
0002-Add-TIS-patches.patch
0003-CGTS-8837-cinder-volume-cannot-be-deleted-after-swact.patch
0004-CGTS-9191-Fix-cinder-calling-nova-over-public-ip.patch
0005-Patch-for-removal-of-default_volume_type-from-API.patch

213
config/puppet-modules/openstack/puppet-cinder-11.3.0/centos/patches/0001-Roll-up-TIS-patches.patch
View File

@ -1,213 +0,0 @@
From 36e8bf659a3d48ba4eb028ece6f3656e62f358c2 Mon Sep 17 00:00:00 2001
From: Daniel Badea <daniel.badea@windriver.com>
Date: Mon, 30 Oct 2017 21:50:45 +0200
Subject: [PATCH] Roll up TIS patches
---
lib/puppet/provider/cinder.rb | 5 ++++-
manifests/backend/iscsi.pp | 19 ++++++++++++++++---
manifests/backend/rbd.pp | 14 +++++++++++---
manifests/db/sync.pp | 3 +++
manifests/init.pp | 7 ++++---
manifests/quota_set.pp | 2 ++
manifests/volume/rbd.pp | 1 +
spec/classes/cinder_volume_iscsi_spec.rb | 2 +-
8 files changed, 42 insertions(+), 11 deletions(-)
diff --git a/lib/puppet/provider/cinder.rb b/lib/puppet/provider/cinder.rb
index 924e8d7..6a0ef2f 100644
--- a/lib/puppet/provider/cinder.rb
+++ b/lib/puppet/provider/cinder.rb
@@ -36,7 +36,10 @@ class Puppet::Provider::Cinder < Puppet::Provider::Openstack
@credentials.user_domain_name = cinder_credentials['user_domain_name']
@credentials.project_domain_name = cinder_credentials['project_domain_name']
end
+ @credentials.region_name = cinder_credentials['region_name']
raise error unless @credentials.set?
+ # set OS_INTERFACE for cinder requests
+ ENV.store('OS_INTERFACE','internal')
Puppet::Provider::Openstack.request(service, action, properties, @credentials)
end
@@ -50,7 +53,7 @@ class Puppet::Provider::Cinder < Puppet::Provider::Openstack
def self.get_cinder_credentials
auth_keys = ['auth_uri', 'project_name', 'username',
- 'password']
+ 'password', 'region_name']
conf = cinder_conf
if conf and conf['keystone_authtoken'] and
auth_keys.all?{|k| !conf['keystone_authtoken'][k].nil?}
diff --git a/manifests/backend/iscsi.pp b/manifests/backend/iscsi.pp
index 9530958..1ccc27c 100644
--- a/manifests/backend/iscsi.pp
+++ b/manifests/backend/iscsi.pp
@@ -103,12 +103,25 @@ define cinder::backend::iscsi (
}
'lioadm': {
- service { 'target':
- ensure => running,
- enable => true,
+ # This service is being managed by Services Manager
+ # and it will be started by SM on an active controller
+ service { 'iscsi':
+ ensure => stopped,
+ name => 'target',
+ enable => false,
tag => 'cinder-support-service',
}
+ cinder_config {
+ "DEFAULT/iscsi_helper": value => $iscsi_helper;
+ "DEFAULT/num_shell_tries": value => 3;
+ "DEFAULT/num_iscsi_scan_tries": value => 3;
+ "DEFAULT/iscsi_num_targets": value => 10000;
+ "DEFAULT/iscsi_target_prefix": value => 'iqn.2010-10.org.openstack:';
+ "DEFAULT/iscsi_ip_address": value => '$my_ip';
+ "DEFAULT/iscsi_port": value => 3260;
+ }
+
package { 'targetcli':
ensure => present,
name => $::cinder::params::lio_package_name,
diff --git a/manifests/backend/rbd.pp b/manifests/backend/rbd.pp
index b310468..2607c7f 100644
--- a/manifests/backend/rbd.pp
+++ b/manifests/backend/rbd.pp
@@ -83,7 +83,7 @@ define cinder::backend::rbd (
$volume_backend_name = $name,
$rbd_ceph_conf = '/etc/ceph/ceph.conf',
$rbd_flatten_volume_from_snapshot = $::os_service_default,
- $rbd_secret_uuid = $::os_service_default,
+ $rbd_secret_uuid = false,
$rbd_max_clone_depth = $::os_service_default,
$rados_connect_timeout = $::os_service_default,
$rados_connection_interval = $::os_service_default,
@@ -102,11 +102,9 @@ define cinder::backend::rbd (
"${name}/volume_backend_name": value => $volume_backend_name;
"${name}/volume_driver": value => 'cinder.volume.drivers.rbd.RBDDriver';
"${name}/rbd_ceph_conf": value => $rbd_ceph_conf;
- "${name}/rbd_user": value => $rbd_user;
"${name}/rbd_pool": value => $rbd_pool;
"${name}/rbd_max_clone_depth": value => $rbd_max_clone_depth;
"${name}/rbd_flatten_volume_from_snapshot": value => $rbd_flatten_volume_from_snapshot;
- "${name}/rbd_secret_uuid": value => $rbd_secret_uuid;
"${name}/rados_connect_timeout": value => $rados_connect_timeout;
"${name}/rados_connection_interval": value => $rados_connection_interval;
"${name}/rados_connection_retries": value => $rados_connection_retries;
@@ -130,6 +128,14 @@ define cinder::backend::rbd (
}
}
+ if $rbd_secret_uuid {
+ cinder_config {"${name}/rbd_secret_uuid": value => $rbd_secret_uuid;}
+ cinder_config {"${name}/rbd_user": value => $rbd_user;}
+ } else {
+ cinder_config {"${name}/rbd_secret_uuid": ensure => absent;}
+ cinder_config {"${name}/rbd_user": ensure => absent;}
+ }
+
if $volume_tmp_dir {
cinder_config {"${name}/volume_tmp_dir": value => $volume_tmp_dir;}
warning('The rbd volume_tmp_dir parameter is deprecated. Please use image_conversion_dir in the cinder base class instead.')
@@ -151,6 +157,7 @@ define cinder::backend::rbd (
}
}
+ if $override_line {
# Creates an empty file if it doesn't yet exist
ensure_resource('file', $::cinder::params::ceph_init_override, {'ensure' => 'present'})
@@ -159,5 +166,6 @@ define cinder::backend::rbd (
path => $::cinder::params::ceph_init_override,
notify => Anchor['cinder::service::begin'],
}
+ }
}
diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp
index a37f746..90f910a 100644
--- a/manifests/db/sync.pp
+++ b/manifests/db/sync.pp
@@ -30,5 +30,8 @@ class cinder::db::sync(
Anchor['cinder::dbsync::begin']
],
notify => Anchor['cinder::dbsync::end'],
+ # Only do the db sync if both controllers are running the same software
+ # version. Avoids impacting mate controller during an upgrade.
+ onlyif => "test $::controller_sw_versions_match = true",
}
}
diff --git a/manifests/init.pp b/manifests/init.pp
index d58b653..bf23eaa 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -19,8 +19,9 @@
# Defaults to $::os_service_default
#
# [*rpc_response_timeout*]
-# (optional) Seconds to wait for a response from a call
-# Defaults to $::os_service_default
+# (Optional) rpc_response_timeout for rpc calls
+# Defaults to 60.
+#
#
# [*control_exchange*]
# (Optional)
@@ -318,7 +319,7 @@ class cinder (
$database_retry_interval = undef,
$database_max_overflow = undef,
$default_transport_url = $::os_service_default,
- $rpc_response_timeout = $::os_service_default,
+ $rpc_response_timeout = '60',
$control_exchange = 'openstack',
$rabbit_ha_queues = $::os_service_default,
$rabbit_heartbeat_timeout_threshold = $::os_service_default,
diff --git a/manifests/quota_set.pp b/manifests/quota_set.pp
index 10c690a..fb4cbe8 100644
--- a/manifests/quota_set.pp
+++ b/manifests/quota_set.pp
@@ -67,6 +67,7 @@ define cinder::quota_set (
"OS_PASSWORD=${os_password}",
"OS_AUTH_URL=${os_auth_url}",
"OS_REGION_NAME=${os_region_name}",
+ "CINDER_ENDPOINT_TYPE=internalURL",
]
}
else {
@@ -75,6 +76,7 @@ define cinder::quota_set (
"OS_USERNAME=${os_username}",
"OS_PASSWORD=${os_password}",
"OS_AUTH_URL=${os_auth_url}",
+ "CINDER_ENDPOINT_TYPE=internalURL",
]
}
diff --git a/manifests/volume/rbd.pp b/manifests/volume/rbd.pp
index accf47b..3971008 100644
--- a/manifests/volume/rbd.pp
+++ b/manifests/volume/rbd.pp
@@ -93,5 +93,6 @@ cinder::backend::rbd instead.')
rados_connection_retries => $rados_connection_retries,
rbd_store_chunk_size => $rbd_store_chunk_size,
extra_options => $extra_options,
+ backend_host => '$host',
}
}
diff --git a/spec/classes/cinder_volume_iscsi_spec.rb b/spec/classes/cinder_volume_iscsi_spec.rb
index 9fc87a9..4e8585a 100644
--- a/spec/classes/cinder_volume_iscsi_spec.rb
+++ b/spec/classes/cinder_volume_iscsi_spec.rb
@@ -19,7 +19,7 @@ describe 'cinder::volume::iscsi' do
it { is_expected.to contain_cinder_config('DEFAULT/volume_driver').with(
:value => 'cinder.volume.drivers.lvm.LVMVolumeDriver')}
it { is_expected.to contain_cinder_config('DEFAULT/iscsi_ip_address').with(:value => '127.0.0.2')}
- it { is_expected.to contain_cinder_config('DEFAULT/iscsi_helper').with(:value => 'tgtadm')}
+ it { is_expected.to contain_cinder_config('DEFAULT/iscsi_helper').with(:value => 'lioadm')}
it { is_expected.to contain_cinder_config('DEFAULT/volume_group').with(:value => '<SERVICE DEFAULT>')}
it { is_expected.to contain_cinder_config('DEFAULT/volumes_dir').with(:value => '/var/lib/cinder/volumes')}
it { is_expected.to contain_cinder_config('DEFAULT/iscsi_protocol').with(:value => '<SERVICE DEFAULT>')}
--
2.7.4

46
config/puppet-modules/openstack/puppet-cinder-11.3.0/centos/patches/0002-CGTS-8837-cinder-volume-cannot-be-deleted-after-swact.patch
View File

@ -1,46 +0,0 @@
From 410f15031197e5a252afed9a1c8b85c4cee136b7 Mon Sep 17 00:00:00 2001
From: Daniel Badea <daniel.badea@windriver.com>
Date: Wed, 31 Jan 2018 13:55:50 +0000
Subject: [PATCH] CGTS-8837 cinder volume cannot be deleted after swact
Using cinder::host causes a deprecation warning in puppet. After
switching to cinder::backend_host and locking/unlocking controller
followed by swact cinder volumes cannot be deleted anymore. This
happens because CONF.host is still used by cinder services (not
entirey replaced with CONF.backend_host).
Set cinder config DEFAULT/host to cinder::host if defined or
cinder::backend_host otherwise.
---
manifests/init.pp | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/manifests/init.pp b/manifests/init.pp
index bf23eaa..3ad82e4 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -472,6 +472,12 @@ instead.")
$default_availability_zone_real = $default_availability_zone
}
+ if is_service_default($host) {
+ $host_real = $backend_host
+ } else {
+ $host_real = $host
+ }
+
cinder_config {
'DEFAULT/report_interval': value => $report_interval;
'DEFAULT/service_down_time': value => $service_down_time;
@@ -480,7 +486,7 @@ instead.")
'DEFAULT/default_availability_zone': value => $default_availability_zone_real;
'DEFAULT/allow_availability_zone_fallback': value => $allow_availability_zone_fallback;
'DEFAULT/image_conversion_dir': value => $image_conversion_dir;
- 'DEFAULT/host': value => $host;
+ 'DEFAULT/host': value => $host_real;
'DEFAULT/backend_host': value => $backend_host;
}
--
1.8.3.1

86
config/puppet-modules/openstack/puppet-cinder-11.3.0/centos/patches/0003-CGTS-9191-Add-nova-interface-config-option.patch
View File

@ -1,86 +0,0 @@
From 60150282b2990ded72eb3c66481bddfeaaa67606 Mon Sep 17 00:00:00 2001
From: Ovidiu Poncea <ovidiu.poncea@windriver.com>
Date: Thu, 22 Mar 2018 05:06:57 -0400
Subject: [PATCH] CGTS-9191: Add nova/interface config option
Cinder stoped using two options, nova_catalog_info and nova_catalog_admin_info
and replaced them with nova/interface.
---
manifests/api.pp | 30 +++++++++++++++++++-----------
1 file changed, 19 insertions(+), 11 deletions(-)
diff --git a/manifests/api.pp b/manifests/api.pp
index b7106a8..7a35c8a 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -47,15 +47,6 @@
# requests. For example, boot-from-volume.
# Defaults to $::os_service_default
#
-# [*nova_catalog_info*]
-# (optional) Match this value when searching for nova in the service
-# catalog.
-# Defaults to 'compute:Compute Service:publicURL'
-#
-# [*nova_catalog_admin_info*]
-# (optional) Same as nova_catalog_info, but for admin endpoint.
-# Defaults to 'compute:Compute Service:adminURL'
-#
# [*service_workers*]
# (optional) Number of cinder-api workers
# Defaults to $::os_workers
@@ -151,6 +142,11 @@
# If this value is modified the catalog URLs in the keystone::auth class
# will also need to be changed to match.
#
+# [*nova_interface*]
+# (optional) Type of the nova endpoint to use. This endpoint will be
+# looked up in the keystone catalog. Allowed values: public, admin, internal
+# Defaults to 'public'.
+#
# DEPRECATED PARAMETERS
#
# [*validation_options*]
@@ -169,9 +165,17 @@
# try_sleep: 10
# Defaults to {}
#
+# [*nova_catalog_info*]
+# (optional) Match this value when searching for nova in the service
+# catalog.
+# Defaults to 'compute:Compute Service:publicURL'
+#
+# [*nova_catalog_admin_info*]
+# (optional) Same as nova_catalog_info, but for admin endpoint.
+# Defaults to 'compute:Compute Service:adminURL'
+#
+
class cinder::api (
- $nova_catalog_info = 'compute:Compute Service:publicURL',
- $nova_catalog_admin_info = 'compute:Compute Service:adminURL',
$os_region_name = $::os_service_default,
$privileged_user = false,
$os_privileged_user_name = $::os_service_default,
@@ -203,8 +207,11 @@ class cinder::api (
$ca_file = $::os_service_default,
$auth_strategy = 'keystone',
$osapi_volume_listen_port = $::os_service_default,
+ $nova_interface = 'public',
# DEPRECATED PARAMETERS
$validation_options = {},
+ $nova_catalog_info = 'compute:Compute Service:publicURL',
+ $nova_catalog_admin_info = 'compute:Compute Service:adminURL',
) inherits cinder::params {
include ::cinder::deps
@@ -289,6 +296,7 @@ running as a standalone service, or httpd for being run by a httpd server")
}
cinder_config {
+ 'nova/interface': value => $nova_interface;
'DEFAULT/nova_catalog_info': value => $nova_catalog_info;
'DEFAULT/nova_catalog_admin_info': value => $nova_catalog_admin_info;
}
--
1.8.3.1

49
config/puppet-modules/openstack/puppet-cinder-11.3.0/centos/patches/0004-CGTS-9219-Remove-default_volume_type-from-api-class.patch
View File

@ -1,49 +0,0 @@
From b9aee291c5e6219423f53ec7d1a1b97213d7641d Mon Sep 17 00:00:00 2001
From: Robert Church <robert.church@windriver.com>
Date: Mon, 9 Apr 2018 10:01:28 -0500
Subject: [PATCH] CGTS-9219: Remove default_volume_type from api class
Allow setting the default_volume type independent of the API as we have
scenarios where we simply want to add/remove the value and restart the API. This
optimizes runtime dependencies.
---
BUILD/openstack-cinder-11.3.0/manifests/api.pp | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/manifests/api.pp b/manifests/api.pp
index 7a35c8a..ffc498b 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -75,13 +75,6 @@
# (optional) Factory to use for ratelimiting
# Defaults to 'cinder.api.v1.limits:RateLimitingMiddleware.factory'
#
-# [*default_volume_type*]
-# (optional) default volume type to use.
-# This should contain the name of the default volume type to use.
-# If not configured, it produces an error when creating a volume
-# without specifying a type.
-# Defaults to $::os_service_default.
-#
# [*validate*]
# (optional) Whether to validate the service is working after any service refreshes
# Defaults to false
@@ -191,7 +184,6 @@ class cinder::api (
$enabled = true,
$manage_service = true,
$ratelimits = $::os_service_default,
- $default_volume_type = $::os_service_default,
$ratelimits_factory =
'cinder.api.v1.limits:RateLimitingMiddleware.factory',
$validate = false,
@@ -287,7 +279,6 @@ running as a standalone service, or httpd for being run by a httpd server")
'DEFAULT/osapi_volume_listen': value => $bind_host;
'DEFAULT/osapi_volume_workers': value => $service_workers;
'DEFAULT/os_region_name': value => $os_region_name;
- 'DEFAULT/default_volume_type': value => $default_volume_type;
'DEFAULT/public_endpoint': value => $public_endpoint;
'DEFAULT/osapi_volume_base_URL': value => $osapi_volume_base_url;
'DEFAULT/osapi_max_limit': value => $osapi_max_limit;
--
1.8.3.1

1
config/puppet-modules/openstack/puppet-cinder-11.3.0/centos/srpm_path
View File

@ -1 +0,0 @@
mirror:Source/puppet-cinder-11.3.0-1.el7.src.rpm

1
config/puppet-modules/openstack/puppet-glance-11.3.0/centos/build_srpm.data
View File

@ -1 +0,0 @@
TIS_PATCH_VER=4

25
config/puppet-modules/openstack/puppet-glance-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
View File

@ -1,25 +0,0 @@
From 2f72d134c0c9a4fdc4e83f0aefab1608da644621 Mon Sep 17 00:00:00 2001
From: Daniel Badea <daniel.badea@windriver.com>
Date: Tue, 31 Oct 2017 15:44:43 +0200
Subject: [PATCH] Update package versioning for TIS format
---
SPECS/puppet-glance.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/puppet-glance.spec b/puppet-glance.spec
index 1e9d4b8..64b1dbe 100644
--- a/SPECS/puppet-glance.spec
+++ b/SPECS/puppet-glance.spec
@@ -1,7 +1,7 @@
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
Name: puppet-glance
Version: 11.3.0
-Release: 1%{?dist}
+Release: 1.el7%{?_tis_dist}.%{tis_patch_ver}
Summary: Puppet module for OpenStack Glance
License: ASL 2.0
--
2.7.4

32
config/puppet-modules/openstack/puppet-glance-11.3.0/centos/meta_patches/0002-Add-TIS-patch.patch
View File

@ -1,32 +0,0 @@
From 534bf798c41db10847c2035a36e49f2d9d459a00 Mon Sep 17 00:00:00 2001
From: Daniel Badea <daniel.badea@windriver.com>
Date: Tue, 31 Oct 2017 17:51:50 +0200
Subject: [PATCH] Add TIS patch
---
SPECS/puppet-glance.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/puppet-glance.spec b/puppet-glance.spec
index 64b1dbe..d6b63d1 100644
--- a/SPECS/puppet-glance.spec
+++ b/SPECS/puppet-glance.spec
@@ -8,6 +8,7 @@ License: ASL 2.0
URL: https://launchpad.net/puppet-glance
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz
+Patch0001: 0001-Roll-up-TIS-patches.patch
BuildArch: noarch
@@ -23,6 +24,7 @@ Puppet module for OpenStack Glance
%prep
%setup -q -n openstack-glance-%{upstream_version}
+%patch0001 -p1
find . -type f -name ".*" -exec rm {} +
find . -size 0 -exec rm {} +
--
2.7.4

32
config/puppet-modules/openstack/puppet-glance-11.3.0/centos/meta_patches/0003-Add-region-cache-support.patch
View File

@ -1,32 +0,0 @@
From 56feda10321fb1e5067b78dfeced8c5adcf8748e Mon Sep 17 00:00:00 2001
From: Stefan Dinescu <stefan.dinescu@windriver.com>
Date: Thu, 16 Nov 2017 18:28:36 +0000
Subject: [PATCH] Add region-cache support
---
SPECS/puppet-glance.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/puppet-glance.spec b/SPECS/puppet-glance.spec
index d6b63d1..1e49ae0 100644
--- a/SPECS/puppet-glance.spec
+++ b/SPECS/puppet-glance.spec
@@ -9,6 +9,7 @@ URL: https://launchpad.net/puppet-glance
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz
Patch0001: 0001-Roll-up-TIS-patches.patch
+Patch0002: 0002-Add-region-cache-support.patch
BuildArch: noarch
@@ -25,6 +26,7 @@ Puppet module for OpenStack Glance
%prep
%setup -q -n openstack-glance-%{upstream_version}
%patch0001 -p1
+%patch0002 -p1
find . -type f -name ".*" -exec rm {} +
find . -size 0 -exec rm {} +
--
2.7.4

32
config/puppet-modules/openstack/puppet-glance-11.3.0/centos/meta_patches/0004-add-username-password-authentication-support-to-api.patch
View File

@ -1,32 +0,0 @@
From 292ba3e769183377dfccc012e979ddbc53fc0356 Mon Sep 17 00:00:00 2001
From: Andy Ning <andy.ning@windriver.com>
Date: Tue, 12 Jun 2018 09:19:40 -0400
Subject: [PATCH 1/1] add username and password authentication support to api
---
SPECS/puppet-glance.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/puppet-glance.spec b/SPECS/puppet-glance.spec
index 1e49ae0..5bb536f 100644
--- a/SPECS/puppet-glance.spec
+++ b/SPECS/puppet-glance.spec
@@ -10,6 +10,7 @@ URL: https://launchpad.net/puppet-glance
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz
Patch0001: 0001-Roll-up-TIS-patches.patch
Patch0002: 0002-Add-region-cache-support.patch
+Patch0003: 0003-add-username-password-authentication-support-to-api.patch
BuildArch: noarch
@@ -27,6 +28,7 @@ Puppet module for OpenStack Glance
%setup -q -n openstack-glance-%{upstream_version}
%patch0001 -p1
%patch0002 -p1
+%patch0003 -p1
find . -type f -name ".*" -exec rm {} +
find . -size 0 -exec rm {} +
--
1.8.3.1

4
config/puppet-modules/openstack/puppet-glance-11.3.0/centos/meta_patches/PATCH_ORDER
View File

@ -1,4 +0,0 @@
0001-Update-package-versioning-for-TIS-format.patch
0002-Add-TIS-patch.patch
0003-Add-region-cache-support.patch
0004-add-username-password-authentication-support-to-api.patch

172
config/puppet-modules/openstack/puppet-glance-11.3.0/centos/patches/0001-Roll-up-TIS-patches.patch
View File

@ -1,172 +0,0 @@
From 77f605262cdf55929b230033faafce04399828e6 Mon Sep 17 00:00:00 2001
From: Daniel Badea <daniel.badea@windriver.com>
Date: Mon, 30 Oct 2017 14:46:53 +0200
Subject: [PATCH] Roll up TIS patches
---
lib/puppet/provider/glance_image/openstack.rb | 2 +-
manifests/api.pp | 30 ++++++++++++++++++++++
manifests/db/sync.pp | 3 +++
manifests/registry.pp | 8 ++++++
spec/classes/glance_api_spec.rb | 3 +++
spec/classes/glance_registry_spec.rb | 1 +
6 files changed, 46 insertions(+), 1 deletion(-)
diff --git a/lib/puppet/provider/glance_image/openstack.rb b/lib/puppet/provider/glance_image/openstack.rb
index 6e6b4b9..4f30980 100644
--- a/lib/puppet/provider/glance_image/openstack.rb
+++ b/lib/puppet/provider/glance_image/openstack.rb
@@ -10,7 +10,7 @@ Puppet::Type.type(:glance_image).provide(
Provider to manage glance_image type.
EOT
- @credentials = Puppet::Provider::Openstack::CredentialsV2_0.new
+ @credentials = Puppet::Provider::Openstack::CredentialsV3.new
# TODO(flaper87): v2 is now the default. Force the use of v2,
# to avoid supporting both versions and other edge cases.
diff --git a/manifests/api.pp b/manifests/api.pp
index 7e5d3f0..d69059d 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -271,6 +271,25 @@
# (optional) Maximum number of results that could be returned by a request
# Default: $::os_service_default.
#
+# === WRS parameters:
+#
+# [*cinder_catalog_info*]
+# (optional) Info to match when looking for cinder in the service catalog.
+# Defaults to 'volume:cinder:publicURL'.
+#
+# [*scrubber_datadir*]
+# (optional) Some sort of scrubber datadir.
+# Defaults to '/var/lib/glance/scrubber'.
+#
+# [*cache_raw_conversion_dir*]
+# (optional) Base directory for Ceph RAW Caching feature
+# Defaults to false, not set. RAW Caching will be disabled.
+#
+# [*graceful_shutdown*]
+# (optional) Enable graceful shutdown on SIGUSR2
+# Defaults to false, not set.
+#
+#
# === deprecated parameters:
#
# [*known_stores*]
@@ -339,6 +358,11 @@ class glance::api(
$validation_options = {},
$limit_param_default = $::os_service_default,
$api_limit_max = $::os_service_default,
+ # WRS PARAMETERS
+ $cinder_catalog_info = 'volume:cinder:publicURL',
+ $scrubber_datadir = '/var/lib/glance/scrubber',
+ $cache_raw_conversion_dir = '/opt/img-conversions/glance',
+ $graceful_shutdown = false,
# DEPRECATED PARAMETERS
$known_stores = false,
) inherits glance {
@@ -379,6 +403,10 @@ class glance::api(
'DEFAULT/enable_v2_api': value => $enable_v2_api;
'DEFAULT/limit_param_default': value => $limit_param_default;
'DEFAULT/api_limit_max': value => $api_limit_max;
+ 'DEFAULT/cinder_catalog_info': value => $cinder_catalog_info;
+ 'DEFAULT/scrubber_datadir': value => $scrubber_datadir;
+ 'DEFAULT/cache_raw_conversion_dir': value=> $cache_raw_conversion_dir;
+ 'DEFAULT/graceful_shutdown': value => $graceful_shutdown;
'glance_store/os_region_name': value => $os_region_name;
}
@@ -403,6 +431,8 @@ class glance::api(
}
if $default_store {
$default_store_real = $default_store
+ } else {
+ $default_store_real = unset
}
if !empty($stores_real) {
# determine value for glance_store/stores
diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp
index 357be0d..43f6168 100644
--- a/manifests/db/sync.pp
+++ b/manifests/db/sync.pp
@@ -30,6 +30,9 @@ class glance::db::sync(
Anchor['glance::dbsync::begin']
],
notify => Anchor['glance::dbsync::end'],
+ # Only do the db sync if both controllers are running the same software
+ # version. Avoids impacting mate controller during an upgrade.
+ onlyif => "test $::controller_sw_versions_match = true",
}
}
diff --git a/manifests/registry.pp b/manifests/registry.pp
index 258fd01..6adfc09 100644
--- a/manifests/registry.pp
+++ b/manifests/registry.pp
@@ -121,6 +121,11 @@
# should be set to False.
# Defaults to $::os_service_default.
#
+# [*graceful_shutdown*]
+# (optional) Enable graceful shutdown on SIGUSR2
+# Defaults to false, not set.
+#
+#
# DEPRECATED PARAMETERS
#
# [*sync_db*]
@@ -155,6 +160,8 @@ class glance::registry(
$ca_file = $::os_service_default,
$os_region_name = $::os_service_default,
$enable_v1_registry = $::os_service_default,
+ # WRS PARAMETERS
+ $graceful_shutdown = false,
# DEPRECATED
$sync_db = undef,
) inherits glance {
@@ -181,6 +188,7 @@ class glance::registry(
'DEFAULT/bind_host': value => $bind_host;
'DEFAULT/bind_port': value => $bind_port;
'DEFAULT/enable_v1_registry': value => $enable_v1_registry;
+ 'DEFAULT/graceful_shutdown': value => $graceful_shutdown;
'glance_store/os_region_name': value => $os_region_name;
}
diff --git a/spec/classes/glance_api_spec.rb b/spec/classes/glance_api_spec.rb
index 9606b1d..eaf1373 100644
--- a/spec/classes/glance_api_spec.rb
+++ b/spec/classes/glance_api_spec.rb
@@ -34,6 +34,8 @@ describe 'glance::api' do
:image_cache_dir => '/var/lib/glance/image-cache',
:image_cache_stall_time => '<SERVICE DEFAULT>',
:image_cache_max_size => '<SERVICE DEFAULT>',
+ :cache_raw_conversion_dir => '/opt/img-conversions/glance',
+ :graceful_shutdown => 'false',
:os_region_name => 'RegionOne',
:pipeline => 'keystone',
:task_time_to_live => '<SERVICE DEFAULT>',
@@ -71,6 +73,7 @@ describe 'glance::api' do
:image_cache_dir => '/tmp/glance',
:image_cache_stall_time => '10',
:image_cache_max_size => '10737418240',
+ :cache_raw_conversion_dir => '/opt/img-conversions/glance',
:os_region_name => 'RegionOne2',
:pipeline => 'keystone2',
:sync_db => false,
diff --git a/spec/classes/glance_registry_spec.rb b/spec/classes/glance_registry_spec.rb
index 0d55cf5..4056f11 100644
--- a/spec/classes/glance_registry_spec.rb
+++ b/spec/classes/glance_registry_spec.rb
@@ -25,6 +25,7 @@ describe 'glance::registry' do
:cert_file => '<SERVICE DEFAULT>',
:key_file => '<SERVICE DEFAULT>',
:enable_v1_registry => '<SERVICE DEFAULT>',
+ :graceful_shutdown => 'false',
}
end
--
2.7.4

64
config/puppet-modules/openstack/puppet-glance-11.3.0/centos/patches/0002-Add-region-cache-support.patch
View File

@ -1,64 +0,0 @@
From be3e4af9cd22d1af7f5df456a6b67188b1cc2c25 Mon Sep 17 00:00:00 2001
From: Stefan Dinescu <stefan.dinescu@windriver.com>
Date: Thu, 16 Nov 2017 18:26:34 +0000
Subject: [PATCH] Add region cache support
---
manifests/api.pp | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/manifests/api.pp b/manifests/api.pp
index d69059d..e563556 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -289,6 +289,13 @@
# (optional) Enable graceful shutdown on SIGUSR2
# Defaults to false, not set.
#
+# [*remote_registry_region_name*]
+# (optional) Remote region name for primary region/cloud
+# Defaults to undef, not set
+#
+# [*data_api*]
+# (optional) API for image info retrieval
+# Defaults to glance.db.sqlalchemy.api
#
# === deprecated parameters:
#
@@ -363,6 +370,8 @@ class glance::api(
$scrubber_datadir = '/var/lib/glance/scrubber',
$cache_raw_conversion_dir = '/opt/img-conversions/glance',
$graceful_shutdown = false,
+ $remote_registry_region_name = undef,
+ $data_api = 'glance.db.sqlalchemy.api',
# DEPRECATED PARAMETERS
$known_stores = false,
) inherits glance {
@@ -408,6 +417,7 @@ class glance::api(
'DEFAULT/cache_raw_conversion_dir': value=> $cache_raw_conversion_dir;
'DEFAULT/graceful_shutdown': value => $graceful_shutdown;
'glance_store/os_region_name': value => $os_region_name;
+ 'DEFAULT/data_api': value => $data_api;
}
# task/taskflow_executor config.
@@ -507,6 +517,16 @@ class glance::api(
glance_api_config { 'paste_deploy/flavor': ensure => absent }
}
+ if $remote_registry_region_name {
+ glance_api_config {
+ 'DEFAULT/remote_registry_region_name':
+ ensure => present,
+ value => $remote_registry_region_name,
+ }
+ } else {
+ glance_api_config { 'DEFAULT/remote_registry_region_name': ensure => absent }
+ }
+
# keystone config
if $auth_strategy == 'keystone' {
include ::glance::api::authtoken
--
2.7.4

51
config/puppet-modules/openstack/puppet-glance-11.3.0/centos/patches/0003-add-username-password-authentication-support-to-api.patch
View File

@ -1,51 +0,0 @@
From e87af6de1e474fc26c74eafaef2671b006f9b81b Mon Sep 17 00:00:00 2001
From: Andy Ning <andy.ning@windriver.com>
Date: Tue, 12 Jun 2018 09:05:27 -0400
Subject: [PATCH 1/1] add username and password authentication support to api
---
manifests/api.pp | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/manifests/api.pp b/manifests/api.pp
index e563556..95230ee 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -374,6 +374,14 @@ class glance::api(
$data_api = 'glance.db.sqlalchemy.api',
# DEPRECATED PARAMETERS
$known_stores = false,
+ # add glance API options for distributed keystone
+ $use_user_token = true,
+ $admin_user = 'admin',
+ $admin_tenant_name = 'admin',
+ $admin_password = '!!',
+ $auth_url = undef,
+ $api_auth_strategy = 'keystone',
+ $auth_region = 'RegionOne',
) inherits glance {
include ::glance::deps
@@ -546,6 +554,19 @@ class glance::api(
'DEFAULT/registry_client_key_file': value => $registry_client_key_file;
}
+ # add glanc API options for distributed keystone
+ if !$use_user_token {
+ glance_api_config {
+ 'DEFAULT/use_user_token': value => $use_user_token;
+ 'DEFAULT/admin_user': value => $admin_user;
+ 'DEFAULT/admin_tenant_name': value => $admin_tenant_name;
+ 'DEFAULT/admin_password': value => $admin_password;
+ 'DEFAULT/auth_url': value => $auth_url;
+ 'DEFAULT/auth_strategy': value => $api_auth_strategy;
+ 'DEFAULT/auth_region': value => $auth_region;
+ }
+ }
+
if $manage_service {
if $enabled {
$service_ensure = 'running'
--
1.8.3.1

1
config/puppet-modules/openstack/puppet-glance-11.3.0/centos/srpm_path
View File

@ -1 +0,0 @@
mirror:Source/puppet-glance-11.3.0-1.el7.src.rpm

1
config/puppet-modules/openstack/puppet-gnocchi-11.3.0/centos/build_srpm.data
View File

@ -1 +0,0 @@
TIS_PATCH_VER=1

43
config/puppet-modules/openstack/puppet-gnocchi-11.3.0/centos/meta_patches/0001-meta-fix-gnocchi-puppet-warning.patch
View File

@ -1,43 +0,0 @@
From 98e5c184bb31839bf32fe5b3b90efa6ec38e4df4 Mon Sep 17 00:00:00 2001
From: Angie Wang <Angie.Wang@windriver.com>
Date: Mon, 28 May 2018 17:37:43 -0400
Subject: [PATCH 1/1] meta fix gnocchi puppet warning
---
SPECS/puppet-gnocchi.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/SPECS/puppet-gnocchi.spec b/SPECS/puppet-gnocchi.spec
index 4645ede..fb54ef3 100644
--- a/SPECS/puppet-gnocchi.spec
+++ b/SPECS/puppet-gnocchi.spec
@@ -1,7 +1,7 @@
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
Name: puppet-gnocchi
Version: 11.3.0
-Release: 1%{?dist}
+Release: 1.el7%{?_tis_dist}.%{tis_patch_ver}
Summary: Puppet module for OpenStack Gnocchi
License: ASL 2.0
@@ -9,6 +9,9 @@ URL: https://launchpad.net/puppet-gnocchi
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz
+# WRS
+Patch0001: 0001-fix-puppet-gnocchi-warning.patch
+
BuildArch: noarch
Requires: puppet-inifile
@@ -22,6 +25,7 @@ Puppet module for OpenStack Gnocchi
%prep
%setup -q -n openstack-gnocchi-%{upstream_version}
+%patch0001 -p1
find . -type f -name ".*" -exec rm {} +
find . -size 0 -exec rm {} +
--
1.8.3.1

1
config/puppet-modules/openstack/puppet-gnocchi-11.3.0/centos/meta_patches/PATCH_ORDER
View File

@ -1 +0,0 @@
0001-meta-fix-gnocchi-puppet-warning.patch

45
config/puppet-modules/openstack/puppet-gnocchi-11.3.0/centos/patches/0001-fix-puppet-gnocchi-warning.patch
View File

@ -1,45 +0,0 @@
From 9a2fa13f3afc543ec0dcf1d309df094cf9b429b9 Mon Sep 17 00:00:00 2001
From: Angie Wang <Angie.Wang@windriver.com>
Date: Tue, 29 May 2018 12:53:58 -0400
Subject: [PATCH 1/1] fix puppet gnocchi warning
---
manifests/logging.pp | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/manifests/logging.pp b/manifests/logging.pp
index c192c9c..e0163c7 100644
--- a/manifests/logging.pp
+++ b/manifests/logging.pp
@@ -95,17 +95,17 @@ class gnocchi::logging(
$log_dir = '/var/log/gnocchi',
$debug = $::os_service_default,
# DEPRECATED
- $logging_context_format_string = $::os_service_default,
- $logging_default_format_string = $::os_service_default,
- $logging_debug_format_suffix = $::os_service_default,
- $logging_exception_prefix = $::os_service_default,
- $log_config_append = $::os_service_default,
- $default_log_levels = $::os_service_default,
- $publish_errors = $::os_service_default,
- $fatal_deprecations = $::os_service_default,
- $instance_format = $::os_service_default,
- $instance_uuid_format = $::os_service_default,
- $log_date_format = $::os_service_default,
+ $logging_context_format_string = undef,
+ $logging_default_format_string = undef,
+ $logging_debug_format_suffix = undef,
+ $logging_exception_prefix = undef,
+ $log_config_append = undef,
+ $default_log_levels = undef,
+ $publish_errors = undef,
+ $fatal_deprecations = undef,
+ $instance_format = undef,
+ $instance_uuid_format = undef,
+ $log_date_format = undef,
) {
include ::gnocchi::deps
--
1.8.3.1

1
config/puppet-modules/openstack/puppet-gnocchi-11.3.0/centos/srpm_path
View File

@ -1 +0,0 @@
mirror:Source/puppet-gnocchi-11.3.0-1.el7.src.rpm

1
config/puppet-modules/openstack/puppet-heat-11.3.0/centos/build_srpm.data
View File

@ -1 +0,0 @@
TIS_PATCH_VER=1

25
config/puppet-modules/openstack/puppet-heat-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
View File

@ -1,25 +0,0 @@
From 83386553c2e10f04d3080fbd9f8b9b8a7aaa1025 Mon Sep 17 00:00:00 2001
From: Don Penney <don.penney@windriver.com>
Date: Tue, 3 Jan 2017 13:29:01 -0500
Subject: [PATCH] Update package versioning for TIS format
---
SPECS/puppet-heat.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/puppet-heat.spec b/SPECS/puppet-heat.spec
index ce1d9a5..710e16c 100644
--- a/SPECS/puppet-heat.spec
+++ b/SPECS/puppet-heat.spec
@@ -1,7 +1,7 @@
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
Name: puppet-heat
Version: 11.3.0
-Release: 1%{?dist}
+Release: 1.el7%{?_tis_dist}.%{tis_patch_ver}
Summary: Puppet module for OpenStack Heat
License: ASL 2.0
--
1.8.3.1

32
config/puppet-modules/openstack/puppet-heat-11.3.0/centos/meta_patches/0002-Add-TIS-Patches.patch
View File

@ -1,32 +0,0 @@
From e2dc69fb6aef8f45556d2884db02942d84543013 Mon Sep 17 00:00:00 2001
From: Don Penney <don.penney@windriver.com>
Date: Tue, 24 Jan 2017 11:12:02 -0500
Subject: [PATCH] Add TIS Patches
---
SPECS/puppet-heat.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/puppet-heat.spec b/SPECS/puppet-heat.spec
index 4ca652e..5c1ec2f 100644
--- a/SPECS/puppet-heat.spec
+++ b/SPECS/puppet-heat.spec
@@ -8,6 +8,7 @@ License: ASL 2.0
URL: https://launchpad.net/puppet-heat
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz
+Patch0001: 0001-Roll-up-TIS-patches.patch
BuildArch: noarch
@@ -23,6 +24,7 @@ Puppet module for OpenStack Heat
%prep
%setup -q -n openstack-heat-%{upstream_version}
+%patch0001 -p1
find . -type f -name ".*" -exec rm {} +
find . -size 0 -exec rm {} +
--
1.8.3.1

2
config/puppet-modules/openstack/puppet-heat-11.3.0/centos/meta_patches/PATCH_ORDER
View File

@ -1,2 +0,0 @@
0001-Update-package-versioning-for-TIS-format.patch
0002-Add-TIS-Patches.patch

152
config/puppet-modules/openstack/puppet-heat-11.3.0/centos/patches/0001-Roll-up-TIS-patches.patch
View File

@ -1,152 +0,0 @@
From 41d3cbbc1a3e359cbed1443327601773fe35cce0 Mon Sep 17 00:00:00 2001
From: Al Bailey <Al.Bailey@windriver.com>
Date: Mon, 6 Nov 2017 15:10:27 -0600
Subject: [PATCH] WRS: Patch1: 0001-Roll-up-TIS-patches.patch
---
manifests/db/sync.pp | 6 +++++-
manifests/engine.pp | 7 +++++++
manifests/init.pp | 8 ++++++++
manifests/keystone/domain.pp | 4 +++-
spec/classes/heat_engine_spec.rb | 3 +++
5 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp
index d1a3416..d866595 100644
--- a/manifests/db/sync.pp
+++ b/manifests/db/sync.pp
@@ -19,7 +19,8 @@ class heat::db::sync(
exec { 'heat-dbsync':
command => "heat-manage ${extra_params} db_sync",
path => '/usr/bin',
- user => 'heat',
+ # For whatever reason, the db_sync doesn't work as heat user
+ #user => 'heat',
refreshonly => true,
try_sleep => 5,
tries => 10,
@@ -30,5 +31,8 @@ class heat::db::sync(
Anchor['heat::dbsync::begin']
],
notify => Anchor['heat::dbsync::end'],
+ # Only do the db sync if both controllers are running the same software
+ # version. Avoids impacting mate controller during an upgrade.
+ onlyif => "test $::controller_sw_versions_match = true",
}
}
diff --git a/manifests/engine.pp b/manifests/engine.pp
index 6b31316..021662f 100644
--- a/manifests/engine.pp
+++ b/manifests/engine.pp
@@ -109,6 +109,11 @@
# (Optional) The directory to search for template files.
# Defaults to $::os_service_default
#
+# [*action_retry_limit*]
+# (optional) Number of times to retry to bring a resource to a non-error
+# state. Set to 0 to disable retries.
+# Defaults to '5'
+#
# [*max_nested_stack_depth*]
# (Optional) Maximum depth allowed when using nested stacks.
# Defaults to $::os_service_default
@@ -135,6 +140,7 @@ class heat::engine (
$reauthentication_auth_method = $::os_service_default,
$environment_dir = $::os_service_default,
$template_dir = $::os_service_default,
+ $action_retry_limit = $::os_service_default,
$max_nested_stack_depth = $::os_service_default,
) {
@@ -194,6 +200,7 @@ class heat::engine (
'DEFAULT/reauthentication_auth_method': value => $reauthentication_auth_method;
'DEFAULT/environment_dir': value => $environment_dir;
'DEFAULT/template_dir': value => $template_dir;
+ 'DEFAULT/action_retry_limit': value => $action_retry_limit;
'DEFAULT/max_nested_stack_depth': value => $max_nested_stack_depth;
}
}
diff --git a/manifests/init.pp b/manifests/init.pp
index f268ecd..5d6d445 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -288,6 +288,11 @@
# take for evaluation.
# Defaults to $::os_service_default.
#
+# === WRS PARAMETERS
+# [*heat_clients_insecure*]
+# (optional) sets the insecure option in the config file under
+# [clients_heat]
+#
# === DEPRECATED PARAMETERS
#
# [*rabbit_host*]
@@ -383,6 +388,8 @@ class heat(
$auth_strategy = 'keystone',
$yaql_memory_quota = $::os_service_default,
$yaql_limit_iterators = $::os_service_default,
+ # WRS PARAMETERS
+ $heat_clients_insecure = false,
# DEPRECATED PARAMETERS
$rabbit_host = $::os_service_default,
$rabbit_port = $::os_service_default,
@@ -480,6 +487,7 @@ instead.")
'trustee/user_domain_name': value => $keystone_user_domain_name;
'clients_keystone/auth_uri': value => $auth_url;
'clients_heat/url': value => $heat_clients_url;
+ 'clients_heat/insecure': value => $heat_clients_insecure;
'clients/endpoint_type': value => $heat_clients_endpoint_type;
}
diff --git a/manifests/keystone/domain.pp b/manifests/keystone/domain.pp
index 98c5013..44aa0c5 100644
--- a/manifests/keystone/domain.pp
+++ b/manifests/keystone/domain.pp
@@ -54,12 +54,14 @@ class heat::keystone::domain (
'enabled' => true,
})
}
+ # fix the user name that has the domain name appended
if $manage_user {
- ensure_resource('keystone_user', "${domain_admin}::${domain_name}", {
+ ensure_resource('keystone_user', $domain_admin, {
'ensure' => 'present',
'enabled' => true,
'email' => $domain_admin_email,
'password' => $domain_password,
+ 'domain' => $domain_name,
})
}
if $manage_role {
diff --git a/spec/classes/heat_engine_spec.rb b/spec/classes/heat_engine_spec.rb
index da4ef71..0150edb 100644
--- a/spec/classes/heat_engine_spec.rb
+++ b/spec/classes/heat_engine_spec.rb
@@ -18,6 +18,7 @@ describe 'heat::engine' do
:reauthentication_auth_method => '<SERVICE DEFAULT>',
:environment_dir => '<SERVICE DEFAULT>',
:template_dir => '<SERVICE DEFAULT>',
+ :action_retry_limit => '<SERVICE DEFAULT>',
:max_nested_stack_depth => '<SERVICE DEFAULT>',
}
end
@@ -48,6 +49,7 @@ describe 'heat::engine' do
:reauthentication_auth_method => 'trusts',
:environment_dir => '/etc/heat/environment.d',
:template_dir => '/etc/heat/templates',
+ :action_retry_limit => '5',
}
].each do |new_params|
describe 'when #{param_set == {} ? "using default" : "specifying"} parameters'
@@ -93,6 +95,7 @@ describe 'heat::engine' do
it { is_expected.to contain_heat_config('DEFAULT/reauthentication_auth_method').with_value( expected_params[:reauthentication_auth_method] ) }
it { is_expected.to contain_heat_config('DEFAULT/environment_dir').with_value( expected_params[:environment_dir] ) }
it { is_expected.to contain_heat_config('DEFAULT/template_dir').with_value( expected_params[:template_dir] ) }
+ it { is_expected.to contain_heat_config('DEFAULT/action_retry_limit').with_value('<SERVICE DEFAULT>') }
end
context 'with disabled service managing' do
--
1.8.3.1

2
config/puppet-modules/openstack/puppet-heat-11.3.0/centos/srpm_path
View File

@ -1,2 +0,0 @@
mirror:Source/puppet-heat-11.3.0-1.el7.src.rpm

1
config/puppet-modules/openstack/puppet-ironic-11.3.0/centos/build_srpm.data
View File

@ -1 +0,0 @@
TIS_PATCH_VER=2

19
config/puppet-modules/openstack/puppet-ironic-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
View File

@ -1,19 +0,0 @@
commit 4509fa0b8006dd147bb848b5648e334aedd26111
Author: Shoaib Nasir <shoaib.nasir@windriver.com>
Date: Thu Nov 30 15:02:19 2017 -0500
Added TIS Versioning to Pike 'puppet-ironic.spec'
diff --git a/SPECS/puppet-ironic.spec b/SPECS/puppet-ironic.spec
index 0375bd3..ba63c5e 100644
--- a/SPECS/puppet-ironic.spec
+++ b/SPECS/puppet-ironic.spec
@@ -1,7 +1,7 @@
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
Name: puppet-ironic
Version: 11.3.0
-Release: 1%{?dist}
+Release: 1%{?_tis_dist}.%{tis_patch_ver}
Summary: Puppet module for OpenStack Ironic
License: ASL 2.0

26
config/puppet-modules/openstack/puppet-ironic-11.3.0/centos/meta_patches/0002-Ironic-dbsync-NeutronGlance-dep.patch
View File

@ -1,26 +0,0 @@
commit 399f1078a0a79d24b0c5fad573fd912eceacefae
Author: Shoaib Nasir <shoaib.nasir@windriver.com>
Date: Fri Dec 1 16:16:52 2017 -0500
Ironic dbsync with Neutron and Glance dependency resolved
diff --git a/SPECS/puppet-ironic.spec b/SPECS/puppet-ironic.spec
index ba63c5e..ee83ddc 100644
--- a/SPECS/puppet-ironic.spec
+++ b/SPECS/puppet-ironic.spec
@@ -8,6 +8,7 @@ License: ASL 2.0
URL: https://launchpad.net/puppet-ironic
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz
+Patch0001: 0001-Ironic-dbsync-NeutronGlance-dep-resolution.patch
BuildArch: noarch
@@ -24,6 +25,7 @@ Puppet module for OpenStack Ironic
%prep
%setup -q -n openstack-ironic-%{upstream_version}
+%patch0001 -p1
find . -type f -name ".*" -exec rm {} +
find . -size 0 -exec rm {} +

32
config/puppet-modules/openstack/puppet-ironic-11.3.0/centos/meta_patches/0003-Apply-xinetd-patch.patch
View File

@ -1,32 +0,0 @@
From 5727bbd6fa8bd6f75888e3a53d4c50fe13ca5a33 Mon Sep 17 00:00:00 2001
From: Al Bailey <Al.Bailey@windriver.com>
Date: Thu, 4 Jan 2018 09:15:21 -0600
Subject: [PATCH 2/2] Apply xinetd patch
---
SPECS/puppet-ironic.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/puppet-ironic.spec b/SPECS/puppet-ironic.spec
index ee83ddc..9199102 100644
--- a/SPECS/puppet-ironic.spec
+++ b/SPECS/puppet-ironic.spec
@@ -9,6 +9,7 @@ URL: https://launchpad.net/puppet-ironic
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz
Patch0001: 0001-Ironic-dbsync-NeutronGlance-dep-resolution.patch
+Patch0002: 0002-Dont-complain-about-xinetd-2.0.0.patch
BuildArch: noarch
@@ -26,6 +27,7 @@ Puppet module for OpenStack Ironic
%prep
%setup -q -n openstack-ironic-%{upstream_version}
%patch0001 -p1
+%patch0002 -p1
find . -type f -name ".*" -exec rm {} +
find . -size 0 -exec rm {} +
--
1.8.3.1

3
config/puppet-modules/openstack/puppet-ironic-11.3.0/centos/meta_patches/PATCH_ORDER
View File

@ -1,3 +0,0 @@
0001-Update-package-versioning-for-TIS-format.patch
0002-Ironic-dbsync-NeutronGlance-dep.patch
0003-Apply-xinetd-patch.patch

78
config/puppet-modules/openstack/puppet-ironic-11.3.0/centos/patches/0001-Ironic-dbsync-NeutronGlance-dep-resolution.patch
View File

@ -1,78 +0,0 @@
commit de50acda387041d6810ffbd91cea3bf52b7dbc8d
Author: Shoaib Nasir <shoaib.nasir@windriver.com>
Date: Thu Dec 7 17:36:26 2017 -0500
WRS Patch1: 0001-Ironic-dbsync-NeutronGlance-dep-resolution.patchng
diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp
index 9e4e36a..f4e3fa1 100644
--- a/manifests/db/sync.pp
+++ b/manifests/db/sync.pp
@@ -15,6 +15,17 @@ class ironic::db::sync(
include ::ironic::deps
include ::ironic::params
+ # NOTE(dtantsur): previous ironic-dbsync was run as root. it will fail to run
+ # as "ironic" user, if there is an old log file owned by root. Let's fix it.
+ # To be removed in Rocky.
+ file { '/var/log/ironic/ironic-dbsync.log':
+ ensure => 'present',
+ owner => 'ironic',
+ group => 'ironic',
+ # /var/log/ironic comes from ironic-common
+ require => Anchor['ironic::install::end']
+ }
+
exec { 'ironic-dbsync':
command => "${::ironic::params::dbsync_command} ${extra_params}",
path => '/usr/bin',
@@ -29,5 +40,6 @@ class ironic::db::sync(
Anchor['ironic::dbsync::begin']
],
notify => Anchor['ironic::dbsync::end'],
+ require => File['/var/log/ironic/ironic-dbsync.log'],
}
}
diff --git a/manifests/glance.pp b/manifests/glance.pp
index 09a65ce..bad84cd 100644
--- a/manifests/glance.pp
+++ b/manifests/glance.pp
@@ -93,19 +93,19 @@ class ironic::glance (
$swift_account_project_name = undef,
) {
- $api_servers_real = pick($::ironic::glance_api_servers, $api_servers)
+ $api_servers_real = $api_servers
if is_array($api_servers_real) {
$api_servers_converted = join($api_servers_real, ',')
} else {
$api_servers_converted = $api_servers_real
}
- $num_retries_real = pick($::ironic::glance_num_retries, $num_retries)
- $api_insecure_real = pick($::ironic::glance_api_insecure, $api_insecure)
+ $num_retries_real = $num_retries
+ $api_insecure_real = $api_insecure
- $swift_account_real = pick($::ironic::conductor::swift_account, $swift_account)
- $swift_temp_url_key_real = pick($::ironic::conductor::swift_temp_url_key, $swift_temp_url_key)
- $swift_temp_url_duration_real = pick($::ironic::conductor::swift_temp_url_duration, $swift_temp_url_duration)
+ $swift_account_real = $swift_account
+ $swift_temp_url_key_real = $swift_temp_url_key
+ $swift_temp_url_duration_real = $swift_temp_url_duration
if ($swift_account_project_name and !is_service_default($swift_account_real)) {
diff --git a/manifests/neutron.pp b/manifests/neutron.pp
index f8cbd5d..35f5e07 100644
--- a/manifests/neutron.pp
+++ b/manifests/neutron.pp
@@ -55,7 +55,7 @@ class ironic::neutron (
$project_domain_name = $::os_service_default,
) {
- $api_endpoint_real = pick($::ironic::api::neutron_url, $api_endpoint)
+ $api_endpoint_real = $api_endpoint
ironic_config {
'neutron/url': value => $api_endpoint_real;

25
config/puppet-modules/openstack/puppet-ironic-11.3.0/centos/patches/0002-Dont-complain-about-xinetd-2.0.0.patch
View File

@ -1,25 +0,0 @@
From 2630b20e0f1063b68e485397ff1479898a70c5d6 Mon Sep 17 00:00:00 2001
From: Al Bailey <Al.Bailey@windriver.com>
Date: Thu, 4 Jan 2018 09:13:41 -0600
Subject: [PATCH] Dont complain about xinetd 2.0.0
---
metadata.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/metadata.json b/metadata.json
index d796045..fdf08c7 100644
--- a/metadata.json
+++ b/metadata.json
@@ -15,7 +15,7 @@
{"name":"puppetlabs/vcsrepo","version_requirement":">=1.3.0 <2.0.0"},
{"name":"openstack/oslo","version_requirement":">=11.3.0 <12.0.0"},
{"name":"puppetlabs/apache","version_requirement":">=1.8.0 <2.0.0"},
- {"name":"puppetlabs/xinetd","version_requirement":">=1.5.0 <2.0.0"}
+ {"name":"puppetlabs/xinetd","version_requirement":">=1.5.0 <=2.0.0"}
],
"data_provider": null,
"description": "Installs and configures OpenStack Ironic (Bare metal).",
--
1.8.3.1

1
config/puppet-modules/openstack/puppet-ironic-11.3.0/centos/srpm_path
View File

@ -1 +0,0 @@
mirror:Source/puppet-ironic-11.3.0-1.el7.src.rpm

1
config/puppet-modules/openstack/puppet-magnum-11.3.0/centos/build_srpm.data
View File

@ -1 +0,0 @@
TIS_PATCH_VER=2

40
config/puppet-modules/openstack/puppet-magnum-11.3.0/centos/meta_patches/0001-meta-Pike-rebase.patch
View File

@ -1,40 +0,0 @@
From e3452f7601e328207daa45ec0120907630a9568c Mon Sep 17 00:00:00 2001
From: Jerry Sun <jerry.sun@windriver.com>
Date: Wed, 29 Nov 2017 11:04:00 -0500
Subject: [PATCH 1/1] meta Pike rebase
---
SPECS/puppet-magnum.spec | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/SPECS/puppet-magnum.spec b/SPECS/puppet-magnum.spec
index e1aac22..fd77fec 100644
--- a/SPECS/puppet-magnum.spec
+++ b/SPECS/puppet-magnum.spec
@@ -2,13 +2,14 @@
Name: puppet-magnum
Version: 11.3.0
-Release: 1%{?dist}
+Release: 1.el7%{?_tis_dist}.%{tis_patch_ver}
Summary: Puppet module for OpenStack Magnum
License: ASL 2.0
URL: https://launchpad.net/puppet-magnum
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz
+Patch0001: 0001-Pike-Rebase.patch
BuildArch: noarch
@@ -24,6 +25,7 @@ Installs and configures OpenStack Magnum.
%prep
%setup -q -n openstack-magnum-%{upstream_version}
+%patch0001 -p1
find . -type f -name ".*" -exec rm {} +
find . -size 0 -exec rm {} +
--
1.8.3.1

32
config/puppet-modules/openstack/puppet-magnum-11.3.0/centos/meta_patches/0002-meta-fixed-puppet-deprecated-warnings.patch
View File

@ -1,32 +0,0 @@
From 06305a07fa3028ab15f115a510e9e4a71c8730c4 Mon Sep 17 00:00:00 2001
From: Jerry Sun <jerry.sun@windriver.com>
Date: Tue, 30 Jan 2018 09:54:26 -0500
Subject: [PATCH 1/1] meta fixed puppet deprecated warnings
---
SPECS/puppet-magnum.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/puppet-magnum.spec b/SPECS/puppet-magnum.spec
index fd77fec..207953e 100644
--- a/SPECS/puppet-magnum.spec
+++ b/SPECS/puppet-magnum.spec
@@ -10,6 +10,7 @@ URL: https://launchpad.net/puppet-magnum
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz
Patch0001: 0001-Pike-Rebase.patch
+Patch0002: 0002-fixed-puppet-deprecated-warnings.patch
BuildArch: noarch
@@ -26,6 +27,7 @@ Installs and configures OpenStack Magnum.
%prep
%setup -q -n openstack-magnum-%{upstream_version}
%patch0001 -p1
+%patch0002 -p1
find . -type f -name ".*" -exec rm {} +
find . -size 0 -exec rm {} +
--
1.8.3.1

2
config/puppet-modules/openstack/puppet-magnum-11.3.0/centos/meta_patches/PATCH_ORDER
View File

@ -1,2 +0,0 @@
0001-meta-Pike-rebase.patch
0002-meta-fixed-puppet-deprecated-warnings.patch

63
config/puppet-modules/openstack/puppet-magnum-11.3.0/centos/patches/0001-Pike-Rebase.patch
View File

@ -1,63 +0,0 @@
From 5c591519c2c72827c1480bffb286949e61b649c8 Mon Sep 17 00:00:00 2001
From: Jerry Sun <jerry.sun@windriver.com>
Date: Wed, 29 Nov 2017 10:53:19 -0500
Subject: [PATCH 1/1] Pike Rebase
---
manifests/init.pp | 7 +++++++
manifests/keystone/domain.pp | 4 +++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/manifests/init.pp b/manifests/init.pp
index e9fed95..4f10c2f 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -97,6 +97,10 @@
# rabbit (for rabbitmq)
# Defaults to 'rabbit'
#
+# WRS
+# [*password_symbols*]
+# (optional) Restrictions on password creation
+#
class magnum(
$package_ensure = 'present',
$notification_transport_url = $::os_service_default,
@@ -119,6 +123,8 @@ class magnum(
$rabbit_virtual_host = $::os_service_default,
$rabbit_password = $::os_service_default,
$rpc_backend = 'rabbit',
+ # WRS
+ $password_symbols = '23456789,ABCDEFGHJKLMNPQRSTUVWXYZ,abcdefghijkmnopqrstuvwxyz',
) {
include ::magnum::deps
@@ -176,4 +182,5 @@ instead.")
topics => $notification_topics,
}
+ magnum_config { 'DEFAULT/password_symbols': value => $password_symbols }
}
diff --git a/manifests/keystone/domain.pp b/manifests/keystone/domain.pp
index 5d9a25d..836fd27 100644
--- a/manifests/keystone/domain.pp
+++ b/manifests/keystone/domain.pp
@@ -55,12 +55,14 @@ class magnum::keystone::domain (
)
}
+ # fix user name that has the domain name appended
if $manage_user {
- ensure_resource('keystone_user', "${domain_admin}::${domain_name}", {
+ ensure_resource('keystone_user', "${domain_admin}", {
'ensure' => 'present',
'enabled' => true,
'email' => $domain_admin_email,
'password' => $domain_password,
+ 'domain' => $domain_name,
}
)
}
--
1.8.3.1

25
config/puppet-modules/openstack/puppet-magnum-11.3.0/centos/patches/0002-fixed-puppet-deprecated-warnings.patch
View File

@ -1,25 +0,0 @@
From 772b57dd30d231773bb6e63d06a8d6ba3d37e7d6 Mon Sep 17 00:00:00 2001
From: Jerry Sun <jerry.sun@windriver.com>
Date: Tue, 30 Jan 2018 09:51:47 -0500
Subject: [PATCH 1/1] fixed puppet deprecated warnings
---
manifests/init.pp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/manifests/init.pp b/manifests/init.pp
index 4f10c2f..a741a54 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -122,7 +122,7 @@ class magnum(
$rabbit_userid = $::os_service_default,
$rabbit_virtual_host = $::os_service_default,
$rabbit_password = $::os_service_default,
- $rpc_backend = 'rabbit',
+ $rpc_backend = undef,
# WRS
$password_symbols = '23456789,ABCDEFGHJKLMNPQRSTUVWXYZ,abcdefghijkmnopqrstuvwxyz',
) {
--
1.8.3.1

1
config/puppet-modules/openstack/puppet-magnum-11.3.0/centos/srpm_path
View File

@ -1 +0,0 @@
mirror:Source/puppet-magnum-11.3.0-1.el7.src.rpm

1
config/puppet-modules/openstack/puppet-murano-11.3.0/centos/build_srpm.data
View File

@ -1 +0,0 @@
TIS_PATCH_VER=3

40
config/puppet-modules/openstack/puppet-murano-11.3.0/centos/meta_patches/0001-meta-Pike-rebase.patch
View File

@ -1,40 +0,0 @@
From d227bb7cb1ac1320ed92c8541bb20983bfc7b9ec Mon Sep 17 00:00:00 2001
From: Jerry Sun <jerry.sun@windriver.com>
Date: Wed, 29 Nov 2017 12:48:33 -0500
Subject: [PATCH 1/1] meta Pike rebase
---
SPECS/puppet-murano.spec | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/SPECS/puppet-murano.spec b/SPECS/puppet-murano.spec
index d842fd7..6ea0cde 100644
--- a/SPECS/puppet-murano.spec
+++ b/SPECS/puppet-murano.spec
@@ -2,13 +2,14 @@
Name: puppet-murano
Version: 11.3.0
-Release: 1%{?dist}
+Release: 1.el7%{?_tis_dist}.%{tis_patch_ver}
Summary: Puppet module for OpenStack Murano
License: ASL 2.0
URL: https://launchpad.net/puppet-murano
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{version}.tar.gz
+Patch0001: 0001-Pike-Rebase.patch
BuildArch: noarch
@@ -25,6 +26,7 @@ Installs and configures OpenStack Murano (Application Catalog).
%prep
%setup -q -n openstack-murano-%{upstream_version}
+%patch0001 -p1
find . -type f -name ".*" -exec rm {} +
--
1.8.3.1

32
config/puppet-modules/openstack/puppet-murano-11.3.0/centos/meta_patches/0002-meta-fixed-puppet-deprecated-warnings.patch
View File

@ -1,32 +0,0 @@
From 641d0ba770d605aa63023e08946d10b39763df8f Mon Sep 17 00:00:00 2001
From: Jerry Sun <jerry.sun@windriver.com>
Date: Tue, 30 Jan 2018 09:49:25 -0500
Subject: [PATCH 1/1] meta fixed puppet deprecated warnings
---
SPECS/puppet-murano.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/puppet-murano.spec b/SPECS/puppet-murano.spec
index 6ea0cde..51b1ef2 100644
--- a/SPECS/puppet-murano.spec
+++ b/SPECS/puppet-murano.spec
@@ -10,6 +10,7 @@ URL: https://launchpad.net/puppet-murano
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{version}.tar.gz
Patch0001: 0001-Pike-Rebase.patch
+Patch0002: 0002-fixed-puppet-deprecated-warnings.patch
BuildArch: noarch
@@ -27,6 +28,7 @@ Installs and configures OpenStack Murano (Application Catalog).
%prep
%setup -q -n openstack-murano-%{upstream_version}
%patch0001 -p1
+%patch0002 -p1
find . -type f -name ".*" -exec rm {} +
--
1.8.3.1

32
config/puppet-modules/openstack/puppet-murano-11.3.0/centos/meta_patches/0003-meta-expose-heat-and-neutron-endpoint-type.patch
View File

@ -1,32 +0,0 @@
From f2b369cb0f552dcd3461204d95fd36076e3558af Mon Sep 17 00:00:00 2001
From: Jerry Sun <jerry.sun@windriver.com>
Date: Mon, 12 Feb 2018 16:03:11 -0500
Subject: [PATCH 1/1] meta expose heat and neutron endpoint type
---
SPECS/puppet-murano.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/puppet-murano.spec b/SPECS/puppet-murano.spec
index 51b1ef2..bcf51b2 100644
--- a/SPECS/puppet-murano.spec
+++ b/SPECS/puppet-murano.spec
@@ -11,6 +11,7 @@ URL: https://launchpad.net/puppet-murano
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{version}.tar.gz
Patch0001: 0001-Pike-Rebase.patch
Patch0002: 0002-fixed-puppet-deprecated-warnings.patch
+Patch0003: 0003-expose-heat-and-neutron-endpoint-type.patch
BuildArch: noarch
@@ -29,6 +30,7 @@ Installs and configures OpenStack Murano (Application Catalog).
%setup -q -n openstack-murano-%{upstream_version}
%patch0001 -p1
%patch0002 -p1
+%patch0003 -p1
find . -type f -name ".*" -exec rm {} +
--
1.8.3.1

3
config/puppet-modules/openstack/puppet-murano-11.3.0/centos/meta_patches/PATCH_ORDER
View File

@ -1,3 +0,0 @@
0001-meta-Pike-rebase.patch
0002-meta-fixed-puppet-deprecated-warnings.patch
0003-meta-expose-heat-and-neutron-endpoint-type.patch

153
config/puppet-modules/openstack/puppet-murano-11.3.0/centos/patches/0001-Pike-Rebase.patch
View File

@ -1,153 +0,0 @@
From 23266d5d4ce487895635fea4e919c9b1490d44d6 Mon Sep 17 00:00:00 2001
From: Jerry Sun <jerry.sun@windriver.com>
Date: Wed, 29 Nov 2017 12:45:05 -0500
Subject: [PATCH 1/1] Pike Rebase
---
manifests/dashboard.pp | 37 -------------------------------------
manifests/init.pp | 12 ++++++++++++
manifests/params.pp | 4 ++--
3 files changed, 14 insertions(+), 39 deletions(-)
diff --git a/manifests/dashboard.pp b/manifests/dashboard.pp
index 8668cec..7c879d9 100644
--- a/manifests/dashboard.pp
+++ b/manifests/dashboard.pp
@@ -72,26 +72,6 @@ class murano::dashboard(
tag => ['openstack', 'murano-packages'],
}
- concat { $::murano::params::local_settings_path: }
-
- concat::fragment { 'original_config':
- target => $::murano::params::local_settings_path,
- source => $::murano::params::local_settings_path,
- order => 1,
- }
-
- concat::fragment { 'murano_dashboard_section':
- target => $::murano::params::local_settings_path,
- content => template('murano/local_settings.py.erb'),
- order => 2,
- }
-
- exec { 'clean_horizon_config':
- command => "sed -e '/^## MURANO_CONFIG_BEGIN/,/^## MURANO_CONFIG_END ##/ d' -i ${::murano::params::local_settings_path}",
- onlyif => "grep '^## MURANO_CONFIG_BEGIN' ${::murano::params::local_settings_path}",
- path => [ '/bin/', '/sbin/', '/usr/bin/', '/usr/sbin/' ],
- }
-
if $::os_package_type == 'ubuntu' {
$collect_static_command = "${collect_static_script} collectstatic --noinput"
} else {
@@ -100,29 +80,17 @@ class murano::dashboard(
exec { 'django_collectstatic':
command => $collect_static_command,
- environment => [
- "APACHE_USER=${::apache::params::user}",
- "APACHE_GROUP=${::apache::params::group}",
- ],
refreshonly => true,
}
exec { 'django_compressstatic':
command => "${collect_static_script} compress --force",
- environment => [
- "APACHE_USER=${::apache::params::user}",
- "APACHE_GROUP=${::apache::params::group}",
- ],
refreshonly => true,
}
if $sync_db {
exec { 'django_syncdb':
command => "${collect_static_script} migrate --noinput",
- environment => [
- "APACHE_USER=${::apache::params::user}",
- "APACHE_GROUP=${::apache::params::group}",
- ],
refreshonly => true,
}
@@ -132,11 +100,6 @@ class murano::dashboard(
}
Package['murano-dashboard']
- -> Exec['clean_horizon_config']
- -> Concat[$::murano::params::local_settings_path]
- -> Service <| title == 'httpd' |>
-
- Package['murano-dashboard']
~> Exec['django_collectstatic']
~> Exec['django_compressstatic']
~> Service <| title == 'httpd' |>
diff --git a/manifests/init.pp b/manifests/init.pp
index 1cc27cc..54ddd50 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -275,6 +275,13 @@
# (optional) The RabbitMQ virtual host.
# Defaults to $::os_service_default
#
+# === WRS addons
+# [disable_murano_agent]
+# (Optional) disable the use of murano agent
+#
+# [api_workers]
+# number of api workers
+#
class murano(
$admin_password,
$package_ensure = 'present',
@@ -331,6 +338,9 @@ class murano(
$auth_uri = 'http://127.0.0.1:5000',
$memcached_servers = $::os_service_default,
$purge_config = false,
+ # WRS
+ $disable_murano_agent = true,
+ $api_workers = $::os_service_default,
# Deprecated
$identity_uri = 'http://127.0.0.1:35357/',
$rabbit_os_host = $::os_service_default,
@@ -410,6 +420,7 @@ deprecated. Please use murano::default_transport_url instead.")
murano_config {
'murano/url' : value => "${service_protocol}://${service_host}:${service_port}";
+ 'murano/api_workers' : value => $api_workers;
'engine/use_trusts' : value => $use_trusts;
@@ -430,6 +441,7 @@ deprecated. Please use murano::default_transport_url instead.")
'networking/default_dns': value => $default_nameservers;
+ 'engine/disable_murano_agent': value => $disable_murano_agent;
'engine/packages_service': value => $packages_service,
}
diff --git a/manifests/params.pp b/manifests/params.pp
index b3eca3f..cf606f0 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -20,7 +20,7 @@ class murano::params {
$common_package_name = 'openstack-murano-common'
$engine_package_name = 'openstack-murano-engine'
$pythonclient_package_name = 'python-muranoclient'
- $dashboard_package_name = 'openstack-murano-dashboard'
+ $dashboard_package_name = 'openstack-murano-ui'
# service names
$cfapi_service_name = 'murano-cf-api'
# dashboard config file
@@ -33,7 +33,7 @@ class murano::params {
$common_package_name = 'murano-common'
$engine_package_name = 'murano-engine'
$pythonclient_package_name = 'python-muranoclient'
- $dashboard_package_name = 'python-murano-dashboard'
+ $dashboard_package_name = 'python-murano-ui'
# service names
$cfapi_service_name = 'murano-cfapi'
# dashboard config file
--
1.8.3.1

28
config/puppet-modules/openstack/puppet-murano-11.3.0/centos/patches/0002-fixed-puppet-deprecated-warnings.patch
View File

@ -1,28 +0,0 @@
From 3c0c5fa0443c07f7c092b1d97989f881fc623172 Mon Sep 17 00:00:00 2001
From: Jerry Sun <jerry.sun@windriver.com>
Date: Tue, 30 Jan 2018 09:43:42 -0500
Subject: [PATCH 1/1] removed default values for depricated fields; they were
causing warnings
---
manifests/init.pp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/manifests/init.pp b/manifests/init.pp
index 54ddd50..09d3f13 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -347,8 +347,8 @@ class murano(
$rabbit_os_port = $::os_service_default,
$rabbit_os_hosts = $::os_service_default,
$rabbit_os_virtual_host = $::os_service_default,
- $rabbit_os_user = 'guest',
- $rabbit_os_password = 'guest',
+ $rabbit_os_user = $::os_service_default,
+ $rabbit_os_password = $::os_service_default,
) inherits murano::params {
include ::murano::deps
--
1.8.3.1

35
config/puppet-modules/openstack/puppet-murano-11.3.0/centos/patches/0003-expose-heat-and-neutron-endpoint-type.patch
View File

@ -1,35 +0,0 @@
From cb98572b4d1b59eaefc1410ae84d67c57714f35e Mon Sep 17 00:00:00 2001
From: Jerry Sun <jerry.sun@windriver.com>
Date: Mon, 12 Feb 2018 15:58:37 -0500
Subject: [PATCH 1/1] Expose heat and neutron endpoint type
---
manifests/init.pp | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/manifests/init.pp b/manifests/init.pp
index 09d3f13..45c13c9 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -341,6 +341,8 @@ class murano(
# WRS
$disable_murano_agent = true,
$api_workers = $::os_service_default,
+ $neutron_endpoint_type = 'internalURL',
+ $heat_endpoint_type = 'internalURL',
# Deprecated
$identity_uri = 'http://127.0.0.1:35357/',
$rabbit_os_host = $::os_service_default,
@@ -478,4 +480,9 @@ deprecated. Please use murano::default_transport_url instead.")
if $sync_db {
include ::murano::db::sync
}
+
+ murano_config {
+ 'neutron/endpoint_type': value => $neutron_endpoint_type;
+ 'heat/endpoint_type': value => $heat_endpoint_type;
+ }
}
--
1.8.3.1

1
config/puppet-modules/openstack/puppet-murano-11.3.0/centos/srpm_path
View File

@ -1 +0,0 @@
mirror:Source/puppet-murano-11.3.0-1.el7.src.rpm

1
config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/build_srpm.data
View File

@ -1 +0,0 @@
TIS_PATCH_VER=13

25
config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
View File

@ -1,25 +0,0 @@
From 28173c888231555fda5e85da6967fe64d201449a Mon Sep 17 00:00:00 2001
From: Don Penney <don.penney@windriver.com>
Date: Tue, 3 Jan 2017 13:30:12 -0500
Subject: Update package versioning for TIS format
---
SPECS/puppet-neutron.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/puppet-neutron.spec b/SPECS/puppet-neutron.spec
index 5563e1d..12252ad 100644
--- a/SPECS/puppet-neutron.spec
+++ b/SPECS/puppet-neutron.spec
@@ -1,7 +1,7 @@
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
Name: puppet-neutron
Version: 11.3.0
-Release: 1%{?dist}
+Release: 1.el7%{?_tis_dist}.%{tis_patch_ver}
Summary: Puppet module for OpenStack Neutron
License: ASL 2.0
--
2.7.4

46
config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/0002-Add-TiS-patches.patch
View File

@ -1,46 +0,0 @@
From 67ee34be8bd3e7829442c97600118148f874ab8d Mon Sep 17 00:00:00 2001
From: Joseph Richard <Joseph.Richard@windriver.com>
Date: Thu, 9 Nov 2017 17:57:50 -0500
Subject: [PATCH 2/2] Add TiS patches
---
SPECS/puppet-neutron.spec | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/SPECS/puppet-neutron.spec b/SPECS/puppet-neutron.spec
index 12252ad..684b3d6 100644
--- a/SPECS/puppet-neutron.spec
+++ b/SPECS/puppet-neutron.spec
@@ -8,6 +8,14 @@ License: ASL 2.0
URL: https://launchpad.net/puppet-neutron
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz
+Patch0001: 0001-Roll-up-TIS-patches.patch
+Patch0002: 0002-Remove-broken-authtoken-references.patch
+Patch0003: 0003-control-provider-network-testing-state.patch
+Patch0004: 0004-set-wsgi-pool-size-to-10-from-100.patch
+Patch0005: 0005-Add-support-for-neutron-bgp-dragent.patch
+Patch0006: 0006-Add-parameters-to-classes.patch
+Patch0007: 0007-update-neutron-bgp-to-use-class-variables.patch
+Patch0008: 0008-dvr-allow-base-mac-address-to-be-configured.patch
BuildArch: noarch
@@ -26,6 +34,14 @@ Puppet module for OpenStack Neutron
%prep
%setup -q -n openstack-neutron-%{upstream_version}
+%patch0001 -p1
+%patch0002 -p1
+%patch0003 -p1
+%patch0004 -p1
+%patch0005 -p1
+%patch0006 -p1
+%patch0007 -p1
+%patch0008 -p1
find . -type f -name ".*" -exec rm {} +
find . -size 0 -exec rm {} +
--
1.8.3.1

32
config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/0003-add-support-for-networking-sfc.patch
View File

@ -1,32 +0,0 @@
From 6239a87b6ea7e24b2a8d612ad443f09de845d6dd Mon Sep 17 00:00:00 2001
From: Steven Webster <steven.webster@windriver.com>
Date: Fri, 5 Jan 2018 12:02:20 -0500
Subject: [PATCH 1/1] Add support for networking SFC
---
SPECS/puppet-neutron.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/puppet-neutron.spec b/SPECS/puppet-neutron.spec
index 684b3d6..58bbd24 100644
--- a/SPECS/puppet-neutron.spec
+++ b/SPECS/puppet-neutron.spec
@@ -16,6 +16,7 @@ Patch0005: 0005-Add-support-for-neutron-bgp-dragent.patch
Patch0006: 0006-Add-parameters-to-classes.patch
Patch0007: 0007-update-neutron-bgp-to-use-class-variables.patch
Patch0008: 0008-dvr-allow-base-mac-address-to-be-configured.patch
+Patch0009: 0009-add-support-for-networking-sfc.patch
BuildArch: noarch
@@ -42,6 +43,7 @@ Puppet module for OpenStack Neutron
%patch0006 -p1
%patch0007 -p1
%patch0008 -p1
+%patch0009 -p1
find . -type f -name ".*" -exec rm {} +
find . -size 0 -exec rm {} +
--
1.8.3.1

32
config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/0004-restore-ovs-service-parameters.patch
View File

@ -1,32 +0,0 @@
From edf5db0a419f65350f6628cc74f144f8fd26e45d Mon Sep 17 00:00:00 2001
From: Matt Peters <matt.peters@windriver.com>
Date: Fri, 18 May 2018 13:35:03 -0500
Subject: [PATCH] restore ovs service parameters
---
SPECS/puppet-neutron.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/puppet-neutron.spec b/SPECS/puppet-neutron.spec
index 58bbd24..831d61b 100644
--- a/SPECS/puppet-neutron.spec
+++ b/SPECS/puppet-neutron.spec
@@ -17,6 +17,7 @@ Patch0006: 0006-Add-parameters-to-classes.patch
Patch0007: 0007-update-neutron-bgp-to-use-class-variables.patch
Patch0008: 0008-dvr-allow-base-mac-address-to-be-configured.patch
Patch0009: 0009-add-support-for-networking-sfc.patch
+Patch0010: 0010-restore-ovs-service-parameters.patch
BuildArch: noarch
@@ -44,6 +45,7 @@ Puppet module for OpenStack Neutron
%patch0007 -p1
%patch0008 -p1
%patch0009 -p1
+%patch0010 -p1
find . -type f -name ".*" -exec rm {} +
find . -size 0 -exec rm {} +
--
1.8.3.1

32
config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/0005-unset-tunnel_types-when-tunnelling-disabled.patch
View File

@ -1,32 +0,0 @@
From c4b5fbe5505de3e673eb2e0b04ce65f9efc9b146 Mon Sep 17 00:00:00 2001
From: Matt Peters <matt.peters@windriver.com>
Date: Sat, 26 May 2018 09:05:10 -0500
Subject: [PATCH] unset tunnel_types when tunnelling disabled
---
SPECS/puppet-neutron.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/puppet-neutron.spec b/SPECS/puppet-neutron.spec
index 831d61b..0db2869 100644
--- a/SPECS/puppet-neutron.spec
+++ b/SPECS/puppet-neutron.spec
@@ -18,6 +18,7 @@ Patch0007: 0007-update-neutron-bgp-to-use-class-variables.patch
Patch0008: 0008-dvr-allow-base-mac-address-to-be-configured.patch
Patch0009: 0009-add-support-for-networking-sfc.patch
Patch0010: 0010-restore-ovs-service-parameters.patch
+Patch0011: 0011-unset-tunnel_types-when-tunneling-disabled.patch
BuildArch: noarch
@@ -46,6 +47,7 @@ Puppet module for OpenStack Neutron
%patch0008 -p1
%patch0009 -p1
%patch0010 -p1
+%patch0011 -p1
find . -type f -name ".*" -exec rm {} +
find . -size 0 -exec rm {} +
--
1.8.3.1

5
config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/meta_patches/PATCH_ORDER
View File

@ -1,5 +0,0 @@
0001-Update-package-versioning-for-TIS-format.patch
0002-Add-TiS-patches.patch
0003-add-support-for-networking-sfc.patch
0004-restore-ovs-service-parameters.patch
0005-unset-tunnel_types-when-tunnelling-disabled.patch

586
config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0001-Roll-up-TIS-patches.patch
View File

@ -1,586 +0,0 @@
From ec56923ecaf2081330b8fa6bf8e4616642275a9b Mon Sep 17 00:00:00 2001
From: Joseph Richard <Joseph.Richard@windriver.com>
Date: Fri, 10 Nov 2017 16:31:33 -0500
Subject: [PATCH 1/8] Roll up TIS patches
---
.../ini_setting.rb | 22 ++++++
.../type/neutron_nuage_metadata_agent_config.rb | 42 +++++++++++
manifests/agents/dhcp.pp | 9 ++-
manifests/agents/l3.pp | 10 ++-
manifests/agents/metadata.pp | 9 ++-
manifests/agents/ml2/sriov.pp | 2 +
manifests/agents/nuage_metadata.pp | 86 ++++++++++++++++++++++
manifests/db/sync.pp | 3 +
manifests/init.pp | 27 +++++++
manifests/params.pp | 75 ++++++++++---------
manifests/plugins/ml2.pp | 5 ++
manifests/plugins/ml2/type_driver.pp | 5 +-
manifests/server.pp | 4 +
manifests/server/notifications.pp | 10 +++
18 files changed, 437 insertions(+), 38 deletions(-)
create mode 100644 lib/puppet/provider/neutron_nuage_metadata_agent_config/ini_setting.rb
create mode 100644 lib/puppet/type/neutron_nuage_metadata_agent_config.rb
create mode 100644 manifests/agents/nuage_metadata.pp
diff --git a/lib/puppet/provider/neutron_nuage_metadata_agent_config/ini_setting.rb b/lib/puppet/provider/neutron_nuage_metadata_agent_config/ini_setting.rb
new file mode 100644
index 0000000..d1d9c4e
--- /dev/null
+++ b/lib/puppet/provider/neutron_nuage_metadata_agent_config/ini_setting.rb
@@ -0,0 +1,22 @@
+Puppet::Type.type(:neutron_nuage_metadata_agent_config).provide(
+ :ini_setting,
+ :parent => Puppet::Type.type(:ini_setting).provider(:ruby)
+) do
+
+ def section
+ resource[:name].split('/', 2).first
+ end
+
+ def setting
+ resource[:name].split('/', 2).last
+ end
+
+ def separator
+ '='
+ end
+
+ def file_path
+ '/etc/default/nuage-metadata-agent'
+ end
+
+end
diff --git a/lib/puppet/type/neutron_nuage_metadata_agent_config.rb b/lib/puppet/type/neutron_nuage_metadata_agent_config.rb
new file mode 100644
index 0000000..0559841
--- /dev/null
+++ b/lib/puppet/type/neutron_nuage_metadata_agent_config.rb
@@ -0,0 +1,42 @@
+Puppet::Type.newtype(:neutron_nuage_metadata_agent_config) do
+
+ ensurable
+
+ newparam(:name, :namevar => true) do
+ desc 'Section/setting name to manage from nuage-metadata-agent'
+ newvalues(/\S*\/\S+/)
+ end
+
+ newproperty(:value) do
+ desc 'The value of the setting to be defined.'
+ munge do |value|
+ value = value.to_s.strip
+ value
+ end
+
+ def is_to_s( currentvalue )
+ if resource.secret?
+ return '[old secret redacted]'
+ else
+ return currentvalue
+ end
+ end
+
+ def should_to_s( newvalue )
+ if resource.secret?
+ return '[new secret redacted]'
+ else
+ return newvalue
+ end
+ end
+ end
+
+ newparam(:secret, :boolean => true) do
+ desc 'Whether to hide the value from Puppet logs. Defaults to `false`.'
+
+ newvalues(:true, :false)
+
+ defaultto false
+ end
+
+end
diff --git a/manifests/agents/dhcp.pp b/manifests/agents/dhcp.pp
index 0f5f26f..e8ca41b 100644
--- a/manifests/agents/dhcp.pp
+++ b/manifests/agents/dhcp.pp
@@ -162,10 +162,17 @@ class neutron::agents::dhcp (
}
}
+ # WRS disabling this in CentOS ??
+ if $::operatingsystem == 'CentOS' {
+ $real_enabled = false
+ } else {
+ $real_enabled = $enabled
+ }
+
service { 'neutron-dhcp-service':
ensure => $service_ensure,
name => $::neutron::params::dhcp_agent_service,
- enable => $enabled,
+ enable => $real_enabled,
tag => 'neutron-service',
}
}
diff --git a/manifests/agents/l3.pp b/manifests/agents/l3.pp
index 651c750..c02d132 100644
--- a/manifests/agents/l3.pp
+++ b/manifests/agents/l3.pp
@@ -159,10 +159,18 @@ class neutron::agents::l3 (
} else {
$service_ensure = 'stopped'
}
+
+ # WRS.
+ if $::operatingsystem == 'CentOS' {
+ $real_enabled = false
+ } else {
+ $real_enabled = $enabled
+ }
+
service { 'neutron-l3':
ensure => $service_ensure,
name => $::neutron::params::l3_agent_service,
- enable => $enabled,
+ enable => $real_enabled,
tag => 'neutron-service',
}
}
diff --git a/manifests/agents/metadata.pp b/manifests/agents/metadata.pp
index 0619a59..b0691e2 100644
--- a/manifests/agents/metadata.pp
+++ b/manifests/agents/metadata.pp
@@ -135,10 +135,17 @@ class neutron::agents::metadata (
}
}
+ # WRS
+ if $::operatingsystem == 'CentOS' {
+ $real_enabled = false
+ } else {
+ $real_enabled = $enabled
+ }
+
service { 'neutron-metadata':
ensure => $service_ensure,
name => $::neutron::params::metadata_agent_service,
- enable => $enabled,
+ enable => $real_enabled,
tag => 'neutron-service',
}
}
diff --git a/manifests/agents/ml2/sriov.pp b/manifests/agents/ml2/sriov.pp
index 9b25b43..736cbee 100644
--- a/manifests/agents/ml2/sriov.pp
+++ b/manifests/agents/ml2/sriov.pp
@@ -114,6 +114,8 @@ class neutron::agents::ml2::sriov (
} else {
$service_ensure = 'stopped'
}
+ } else {
+ $service_ensure = 'stopped'
}
service { 'neutron-sriov-nic-agent-service':
diff --git a/manifests/agents/nuage_metadata.pp b/manifests/agents/nuage_metadata.pp
new file mode 100644
index 0000000..776a3db
--- /dev/null
+++ b/manifests/agents/nuage_metadata.pp
@@ -0,0 +1,86 @@
+# == Class: neutron::agents::nuage_metadata
+#
+# Setup and configure Neutron nuage metadata agent.
+#
+# === Parameters
+#
+# [*metadata_port*]
+# The TCP Port used by Nuage metadata agent. Defaults to 9697.
+#
+# [*nova_metadata_ip*]
+# (required) IP address used by Nova metadata server.
+#
+# [*nova_metadata_port*]
+# The TCP Port used by Nova metadata server. Defaults to 8775.
+#
+# [*metadata_proxy_shared_secret*]
+# (required) Used to sign the Instance-ID header.
+#
+# [*nova_client_version*]
+# Version of nova client. Defaults to 2.
+#
+# [*nova_os_username*]
+# (required) Nova username.
+#
+# [*nova_os_password*]
+# (required) Nova password.
+#
+# [*nova_os_tenant_name*]
+# (required) Nova tenant name.
+#
+# [*nova_os_auth_url*]
+# (required) Nova auth URL. Format: http://<ip_address>:5000/v2.0
+#
+# [*nova_metadata_agent_start_with_ovs*]
+# If nuage-metadata-agent needs to be started with nuage-openvswitch-switch.
+# Defaults to true.
+#
+# [*nova_api_endpoint_type*]
+# Nova API endpoint type (one of publicURL, internalURL, adminURL).
+# Defaults to publicURL.
+#
+# [*nova_region_name*]
+# (required) Nova region name.
+#
+
+class neutron::agents::nuage_metadata (
+ $metadata_port = '9697',
+ $nova_metadata_ip = undef,
+ $nova_metadata_port = '8775',
+ $metadata_proxy_shared_secret,
+ $nova_client_version = '2',
+ $nova_os_username = undef,
+ $nova_os_password,
+ $nova_os_tenant_name = undef,
+ $nova_os_auth_url = undef,
+ $nova_metadata_agent_start_with_ovs = 'true',
+ $nova_api_endpoint_type = 'publicURL',
+ $nova_region_name = undef,
+ ) {
+
+ Neutron_config<||> ~> Service['nuage-metadata-agent']
+ Neutron_nuage_metadata_agent_config<||> ~> Service['nuage-metadata-agent']
+
+ neutron_nuage_metadata_agent_config {
+ '/METADATA_PORT': value => $metadata_port;
+ '/NOVA_METADATA_IP': value => $nova_metadata_ip;
+ '/NOVA_METADATA_PORT': value => $nova_metadata_port;
+ '/METADATA_PROXY_SHARED_SECRET': value => $metadata_proxy_shared_secret;
+ '/NOVA_CLIENT_VERSION': value => $nova_client_version;
+ '/NOVA_OS_USERNAME': value => $nova_os_username;
+ '/NOVA_OS_PASSWORD': value => $nova_os_password;
+ '/NOVA_OS_TENANT_NAME': value => $nova_os_tenant_name;
+ '/NOVA_OS_AUTH_URL': value => $nova_os_auth_url;
+ '/NUAGE_METADATA_AGENT_START_WITH_OVS': value=> $nova_metadata_agent_start_with_ovs;
+ '/NOVA_API_ENDPOINT_TYPE': value => $nova_api_endpoint_type;
+ '/NOVA_REGION_NAME': value => $nova_region_name;
+ }
+
+ service { 'nuage-metadata-agent':
+ ensure => 'running',
+ enable => false,
+ hasstatus => false,
+ hasrestart => true,
+ require => Class['neutron'],
+ }
+}
diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp
index 6e6a8b9..98679f6 100644
--- a/manifests/db/sync.pp
+++ b/manifests/db/sync.pp
@@ -37,5 +37,8 @@ class neutron::db::sync(
Anchor['neutron::dbsync::begin']
],
notify => Anchor['neutron::dbsync::end'],
+ # Only do the db sync if both controllers are running the same software
+ # version. Avoids impacting mate controller during an upgrade.
+ onlyif => "test $::controller_sw_versions_match = true",
}
}
diff --git a/manifests/init.pp b/manifests/init.pp
index 92e49b6..6f611ef 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -329,6 +329,23 @@
# transport://user:pass@host1:port[,hostN:portN]/virtual_host
# Defaults to $::os_service_default.
#
+#
+# WRS PARAMETERS
+#
+# [*host_driver*]
+# (optional) Sets a specific object class to be used as the host
+# management driver
+#
+# [*fm_driver*]
+# (optional) Sets a specific object class to be used as the fault
+# management driver
+#
+#
+# [*vlan_transparent*]
+# (optional) Allow networks to be created with vlan_transparent attribute
+#
+#
+#
# DEPRECATED PARAMETERS
#
# [*rabbit_password*]
@@ -422,6 +439,10 @@ class neutron (
$notification_driver = $::os_service_default,
$notification_topics = $::os_service_default,
$notification_transport_url = $::os_service_default,
+ # WRS
+ $host_driver = 'neutron.drivers.host.NoopHostDriver',
+ $fm_driver = 'neutron.drivers.fm.NoopFmDriver',
+ $vlan_transparent = false,
# DEPRECATED PARAMETERS
$rabbit_password = $::os_service_default,
$rabbit_host = $::os_service_default,
@@ -485,6 +506,8 @@ instead.")
purge => $purge_config,
}
+ $ceilometer_driver = "[ messagingv2 ] "
+
neutron_config {
'DEFAULT/bind_host': value => $bind_host;
'DEFAULT/bind_port': value => $bind_port;
@@ -504,6 +527,10 @@ instead.")
'agent/root_helper': value => $root_helper;
'agent/root_helper_daemon': value => $root_helper_daemon;
'agent/report_interval': value => $report_interval;
+ # WRS
+ 'DEFAULT/host_driver': value => $host_driver;
+ 'DEFAULT/fm_driver': value => $fm_driver;
+ 'DEFAULT/vlan_transparent': value => $vlan_transparent;
}
oslo::messaging::default { 'neutron_config':
diff --git a/manifests/params.pp b/manifests/params.pp
index fdb0645..aeb5c66 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -7,28 +7,29 @@ class neutron::params {
$client_package = 'python-neutronclient'
$server_service = 'neutron-server'
- $ovs_agent_service = 'neutron-openvswitch-agent'
- $linuxbridge_agent_service = 'neutron-linuxbridge-agent'
- $cisco_config_file = '/etc/neutron/plugins/cisco/cisco_plugins.ini'
+ #$ovs_agent_service = 'neutron-openvswitch-agent'
+ #$linuxbridge_agent_service = 'neutron-linuxbridge-agent'
+ #$cisco_config_file = '/etc/neutron/plugins/cisco/cisco_plugins.ini'
$opencontrail_plugin_package = 'neutron-plugin-contrail'
$opencontrail_config_file = '/etc/neutron/plugins/opencontrail/ContrailPlugin.ini'
- $midonet_server_package = 'python-networking-midonet'
- $midonet_server_package_ext = 'python-networking-midonet-ext'
- $midonet_config_file = '/etc/neutron/plugins/midonet/midonet.ini'
+ #$midonet_server_package = 'python-networking-midonet'
+ #$midonet_server_package_ext = 'python-networking-midonet-ext'
+ #$midonet_config_file = '/etc/neutron/plugins/midonet/midonet.ini'
$ovn_plugin_package = 'python-networking-ovn'
$vpp_plugin_package = 'python-networking-vpp'
$vpp_agent_service = 'neutron-vpp-agent'
- $plumgrid_plugin_package = 'networking-plumgrid'
- $plumgrid_pythonlib_package = 'plumgrid-pythonlib'
- $plumgrid_config_file = '/etc/neutron/plugins/plumgrid/plumgrid.ini'
+ #$plumgrid_plugin_package = 'networking-plumgrid'
+ #$plumgrid_pythonlib_package = 'plumgrid-pythonlib'
+ #$plumgrid_config_file = '/etc/neutron/plugins/plumgrid/plumgrid.ini'
$nuage_config_file = '/etc/neutron/plugins/nuage/plugin.ini'
$dhcp_agent_service = 'neutron-dhcp-agent'
$lbaasv2_agent_service = 'neutron-lbaasv2-agent'
$haproxy_package = 'haproxy'
- $metering_agent_service = 'neutron-metering-agent'
+ #$metering_agent_service = 'neutron-metering-agent'
- $vpnaas_agent_service = 'neutron-vpn-agent'
+ #$vpnaas_agent_service = 'neutron-vpn-agent'
- $l3_agent_service = 'neutron-l3-agent'
+ $l3_agent_service = 'neutron-l3-agent'
$metadata_agent_service = 'neutron-metadata-agent'
+ $metadata_agent_package = undef
$bagpipe_bgp_package = 'openstack-bagpipe-bgp'
$bgpvpn_bagpipe_package = 'python-networking-bagpipe'
$bgpvpn_bagpipe_service = 'bagpipe-bgp'
@@ -36,41 +37,47 @@ class neutron::params {
$l2gw_agent_service = 'neutron-l2gw-agent'
$nsx_plugin_package = 'vmware-nsx'
$nsx_config_file = '/etc/neutron/plugins/vmware/nsx.ini'
+ $vswitch_agent_service = ''
+ $router_scheduler_driver = 'neutron.scheduler.l3_agent_scheduler.HostBasedScheduler'
+ $network_scheduler_driver = 'neutron.scheduler.dhcp_agent_scheduler.HostBasedScheduler'
+ $router_status_managed = true
+ # CentOS is in the Redhat osfamily
if($::osfamily == 'Redhat') {
$nobody_user_group = 'nobody'
$package_name = 'openstack-neutron'
$server_package = false
- $ml2_server_package = 'openstack-neutron-ml2'
- $ovs_agent_package = false
- $ovs_server_package = 'openstack-neutron-openvswitch'
- $ovs_cleanup_service = 'neutron-ovs-cleanup'
- $libnl_package = 'libnl'
- $package_provider = 'rpm'
- $linuxbridge_agent_package = false
- $linuxbridge_server_package = 'openstack-neutron-linuxbridge'
+ #$ml2_server_package = 'openstack-neutron-ml2'
+ $ml2_server_package = false
+ #$ovs_agent_package = false
+ #$ovs_server_package = 'openstack-neutron-openvswitch'
+ #$ovs_cleanup_service = 'neutron-ovs-cleanup'
+ #$libnl_package = 'libnl'
+ #$package_provider = 'rpm'
+ #$linuxbridge_agent_package = false
+ #$linuxbridge_server_package = 'openstack-neutron-linuxbridge'
$sriov_nic_agent_service = 'neutron-sriov-nic-agent'
$sriov_nic_agent_package = 'openstack-neutron-sriov-nic-agent'
$bigswitch_lldp_package = 'openstack-neutron-bigswitch-lldp'
- $bigswitch_agent_package = 'openstack-neutron-bigswitch-agent'
- $bigswitch_lldp_service = 'neutron-bsn-lldp'
- $bigswitch_agent_service = 'neutron-bsn-agent'
- $cisco_server_package = 'openstack-neutron-cisco'
- $nvp_server_package = 'openstack-neutron-nicira'
+ #$bigswitch_agent_package = 'openstack-neutron-bigswitch-agent'
+ #$bigswitch_lldp_service = 'neutron-bsn-lldp'
+ #$bigswitch_agent_service = 'neutron-bsn-agent'
+ #$cisco_server_package = 'openstack-neutron-cisco'
+ #$nvp_server_package = 'openstack-neutron-nicira'
$dhcp_agent_package = false
- $lbaasv2_agent_package = 'openstack-neutron-lbaas'
- $metering_agent_package = 'openstack-neutron-metering-agent'
- $vpnaas_agent_package = 'openstack-neutron-vpnaas'
+ #$lbaasv2_agent_package = 'openstack-neutron-lbaas'
+ #$metering_agent_package = 'openstack-neutron-metering-agent'
+ #$vpnaas_agent_package = 'openstack-neutron-vpnaas'
$l2gw_agent_package = 'openstack-neutron-l2gw-agent'
$l2gw_package = 'python2-networking-l2gw'
- if $::operatingsystemrelease =~ /^7.*/ or $::operatingsystem == 'Fedora' {
- $openswan_package = 'libreswan'
- } else {
- $openswan_package = 'openswan'
- }
- $libreswan_package = 'libreswan'
+ #if $::operatingsystemrelease =~ /^7.*/ or $::operatingsystem == 'Fedora' {
+ # $openswan_package = 'libreswan'
+ #} else {
+ # $openswan_package = 'openswan'
+ #}
+ #$libreswan_package = 'libreswan'
$l3_agent_package = false
- $fwaas_package = 'openstack-neutron-fwaas'
+ #$fwaas_package = 'openstack-neutron-fwaas'
$neutron_wsgi_script_path = '/var/www/cgi-bin/neutron'
$neutron_wsgi_script_source = '/usr/bin/neutron-api'
} elsif($::osfamily == 'Debian') {
@@ -99,7 +106,7 @@ class neutron::params {
$vpnaas_agent_package = 'neutron-vpn-agent'
$openswan_package = 'openswan'
$libreswan_package = false
- $metadata_agent_package = 'neutron-metadata-agent'
+ $metadata_agent_package = undef
$l3_agent_package = 'neutron-l3-agent'
$fwaas_package = 'python-neutron-fwaas'
$l2gw_agent_package = 'neutron-l2gateway-agent'
diff --git a/manifests/plugins/ml2.pp b/manifests/plugins/ml2.pp
index b943593..92fb5b4 100644
--- a/manifests/plugins/ml2.pp
+++ b/manifests/plugins/ml2.pp
@@ -152,6 +152,8 @@ class neutron::plugins::ml2 (
$purge_config = false,
$max_header_size = $::os_service_default,
$overlay_ip_version = $::os_service_default,
+ $ensure_default_security_group = true,
+ $notify_interval = 0,
# DEPRECATED PARAMETERS
$supported_pci_vendor_devs = undef,
) {
@@ -230,6 +232,9 @@ class neutron::plugins::ml2 (
'ml2/overlay_ip_version': value => $overlay_ip_version;
'securitygroup/enable_security_group': value => $enable_security_group;
'securitygroup/firewall_driver': value => $firewall_driver;
+ # WRS
+ 'securitygroup/ensure_default_security_group': value => $ensure_default_security_group;
+ 'securitygroup/notify_interval': value => $notify_interval;
}
if is_service_default($physical_network_mtus) {
diff --git a/manifests/plugins/ml2/type_driver.pp b/manifests/plugins/ml2/type_driver.pp
index b158695..20141f0 100644
--- a/manifests/plugins/ml2/type_driver.pp
+++ b/manifests/plugins/ml2/type_driver.pp
@@ -112,6 +112,9 @@ define neutron::plugins::ml2::type_driver (
elsif ($name == 'local') {
warning('local type_driver is useful only for single-box, because it provides no connectivity between hosts')
}
+ elsif ($name == 'managed_flat' or $name == 'managed_vlan' or $name == 'managed_vxlan') {
+ debug('managed_flat, managed_vlan, and managed_vxlan type_driver requires further runtime configuration')
+ }
elsif ($name == 'nexus_vxlan') {
# Nexus_vxlan type driver has its own class separate from this one
}
@@ -130,6 +133,6 @@ define neutron::plugins::ml2::type_driver (
}
else {
# detect an invalid type_drivers value
- warning('type_driver unknown.')
+ warning('type_driver (${name}) unknown.')
}
}
diff --git a/manifests/server.pp b/manifests/server.pp
index 785c59c..8a1a3f7 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -256,6 +256,8 @@ class neutron::server (
$service_providers = $::os_service_default,
$auth_strategy = 'keystone',
$enable_proxy_headers_parsing = $::os_service_default,
+ # WRS
+ $router_status_managed = $neutron::params::router_status_managed,
# DEPRECATED PARAMETERS
$log_dir = undef,
$log_file = undef,
@@ -340,6 +342,8 @@ class neutron::server (
'DEFAULT/default_availability_zones': value => join(any2array($default_availability_zones), ',');
'DEFAULT/network_auto_schedule': value => $network_auto_schedule;
'service_providers/service_provider': value => $service_providers;
+ # WRS
+ 'DEFAULT/router_status_managed': value => $router_status_managed;
}
if $state_path {
diff --git a/manifests/server/notifications.pp b/manifests/server/notifications.pp
index d398245..f55751d 100644
--- a/manifests/server/notifications.pp
+++ b/manifests/server/notifications.pp
@@ -50,6 +50,10 @@
# (optional) The name of the admin nova tenant
# Defaults to 'services'
#
+# [*project_domain_name*]
+# (optional) Nova project's domain name
+# Defaults to 'Default'
+#
# [*project_domain_id*]
# (optional) Nova project's domain ID
# Defaults to 'default'
@@ -62,6 +66,10 @@
# (optional) Nova project's name
# Defaults to 'services'
#
+# [*user_domain_name*]
+# (optional) User's domain name for connection to nova in admin context
+# Defaults to 'Default'
+#
# [*user_domain_id*]
# (optional) User's domain ID for connection to nova in admin context
# Defaults to 'default'
@@ -105,6 +113,7 @@ class neutron::server::notifications (
$user_domain_name = 'Default',
$auth_url = 'http://127.0.0.1:35357',
$region_name = $::os_service_default,
+ $endpoint_type = 'public',
# DEPRECATED PARAMETERS
$auth_plugin = $::os_service_default,
) {
@@ -121,6 +130,7 @@ class neutron::server::notifications (
'nova/password': value => $password, secret => true;
'nova/project_domain_id': value => $project_domain_id;
'nova/project_domain_name': value => $project_domain_name;
+ 'nova/endpoint_type': value => $endpoint_type;
'nova/project_name': value => $project_name;
'nova/user_domain_id': value => $user_domain_id;
'nova/user_domain_name': value => $user_domain_name;
--
1.8.3.1

41
config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0002-Remove-broken-authtoken-references.patch
View File

@ -1,41 +0,0 @@
From 90d515932132d54d5a3ce7091dcd16f537f24d59 Mon Sep 17 00:00:00 2001
From: Joseph Richard <Joseph.Richard@windriver.com>
Date: Fri, 10 Nov 2017 11:31:49 -0500
Subject: [PATCH 2/8] Remove broken authtoken references
---
manifests/logging.pp | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/manifests/logging.pp b/manifests/logging.pp
index acb376d..d06cbd4 100644
--- a/manifests/logging.pp
+++ b/manifests/logging.pp
@@ -121,19 +121,13 @@ class neutron::logging (
include ::neutron::deps
- $debug_real = pick($::neutron::debug,$debug)
- $use_syslog_real = pick($::neutron::use_syslog,$use_syslog)
- $use_stderr_real = pick($::neutron::use_stderr,$use_stderr)
- $log_file_real = pick($::neutron::log_file,$log_file)
- $log_dir_real = pick($::neutron::log_dir,$log_dir)
-
oslo::log { 'neutron_config':
- debug => $debug_real,
- use_stderr => $use_stderr_real,
- use_syslog => $use_syslog_real,
+ debug => $debug,
+ use_stderr => $use_stderr,
+ use_syslog => $use_syslog,
syslog_log_facility => $syslog_log_facility,
- log_file => $log_file_real,
- log_dir => $log_dir_real,
+ log_file => $log_file,
+ log_dir => $log_dir,
log_config_append => $log_config_append,
log_date_format => $log_date_format,
watch_log_file => $watch_log_file,
--
1.8.3.1

32
config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0003-control-provider-network-testing-state.patch
View File

@ -1,32 +0,0 @@
From 49c76cf9f9025a94b64fff0bb0746c74f536e620 Mon Sep 17 00:00:00 2001
From: Joseph Richard <Joseph.Richard@windriver.com>
Date: Fri, 10 Nov 2017 11:31:49 -0500
Subject: [PATCH 3/8] control provider network testing state
---
manifests/init.pp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/manifests/init.pp b/manifests/init.pp
index 6f611ef..6a223df 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -443,6 +443,7 @@ class neutron (
$host_driver = 'neutron.drivers.host.NoopHostDriver',
$fm_driver = 'neutron.drivers.fm.NoopFmDriver',
$vlan_transparent = false,
+ $pnet_audit_enabled = true,
# DEPRECATED PARAMETERS
$rabbit_password = $::os_service_default,
$rabbit_host = $::os_service_default,
@@ -531,6 +532,7 @@ instead.")
'DEFAULT/host_driver': value => $host_driver;
'DEFAULT/fm_driver': value => $fm_driver;
'DEFAULT/vlan_transparent': value => $vlan_transparent;
+ 'pnet_connectivity/pnet_audit_enabled': value => $pnet_audit_enabled;
}
oslo::messaging::default { 'neutron_config':
--
1.8.3.1

59
config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0004-set-wsgi-pool-size-to-10-from-100.patch
View File

@ -1,59 +0,0 @@
From bcdf10df2ba5f68bb61ff2b86f0a6cb813271e7d Mon Sep 17 00:00:00 2001
From: Joseph Richard <Joseph.Richard@windriver.com>
Date: Fri, 10 Nov 2017 11:31:50 -0500
Subject: [PATCH 4/8] set wsgi pool size to 10 from 100
---
manifests/init.pp | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/manifests/init.pp b/manifests/init.pp
index 6a223df..78b994b 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -329,6 +329,10 @@
# transport://user:pass@host1:port[,hostN:portN]/virtual_host
# Defaults to $::os_service_default.
#
+# [*wsgi_default_pool_size*]
+# (optional) Size of the pool of greenthreads used by wsgi (integer value)
+# Defaults to $::os_service_default.
+#
#
# WRS PARAMETERS
#
@@ -439,6 +443,7 @@ class neutron (
$notification_driver = $::os_service_default,
$notification_topics = $::os_service_default,
$notification_transport_url = $::os_service_default,
+ $wsgi_default_pool_size = 100,
# WRS
$host_driver = 'neutron.drivers.host.NoopHostDriver',
$fm_driver = 'neutron.drivers.fm.NoopFmDriver',
@@ -549,6 +554,13 @@ instead.")
transport_url => $notification_transport_url,
}
+ oslo::service { 'neutron_config':
+ wsgi_default_pool_size => $wsgi_default_pool_size,
+ cert_file => $cert_file,
+ key_file => $key_file,
+ ca_file => $ca_file,
+ }
+
if ! is_service_default ($service_plugins) and ($service_plugins) {
if is_array($service_plugins) {
neutron_config { 'DEFAULT/service_plugins': value => join($service_plugins, ',') }
@@ -602,9 +614,6 @@ instead.")
# SSL Options
neutron_config {
'DEFAULT/use_ssl': value => $use_ssl;
- 'ssl/cert_file': value => $cert_file;
- 'ssl/key_file': value => $key_file;
- 'ssl/ca_file': value => $ca_file;
}
}
--
1.8.3.1

124
config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0005-Add-support-for-neutron-bgp-dragent.patch
View File

@ -1,124 +0,0 @@
From 4960835d29eeed60106bb78e0c43de9664c9c0b8 Mon Sep 17 00:00:00 2001
From: Joseph Richard <Joseph.Richard@windriver.com>
Date: Fri, 10 Nov 2017 16:31:47 -0500
Subject: [PATCH 5/8] Add support for neutron bgp dragent
---
.../neutron_bgp_dragent_config/ini_setting.rb | 22 +++++++++++++
lib/puppet/type/neutron_bgp_dragent_config.rb | 18 +++++++++++
manifests/bgp.pp | 36 ++++++++++++++++++++++
manifests/params.pp | 1 +
4 files changed, 77 insertions(+)
create mode 100644 lib/puppet/provider/neutron_bgp_dragent_config/ini_setting.rb
create mode 100644 lib/puppet/type/neutron_bgp_dragent_config.rb
create mode 100644 manifests/bgp.pp
diff --git a/lib/puppet/provider/neutron_bgp_dragent_config/ini_setting.rb b/lib/puppet/provider/neutron_bgp_dragent_config/ini_setting.rb
new file mode 100644
index 0000000..aa3e6fb
--- /dev/null
+++ b/lib/puppet/provider/neutron_bgp_dragent_config/ini_setting.rb
@@ -0,0 +1,22 @@
+Puppet::Type.type(:neutron_bgp_dragent_config).provide(
+ :ini_setting,
+ :parent => Puppet::Type.type(:ini_setting).provider(:ruby)
+) do
+
+ def section
+ resource[:name].split('/', 2).first
+ end
+
+ def setting
+ resource[:name].split('/', 2).last
+ end
+
+ def separator
+ '='
+ end
+
+ def file_path
+ '/etc/neutron/bgp_dragent.ini'
+ end
+
+end
diff --git a/lib/puppet/type/neutron_bgp_dragent_config.rb b/lib/puppet/type/neutron_bgp_dragent_config.rb
new file mode 100644
index 0000000..2db88d2
--- /dev/null
+++ b/lib/puppet/type/neutron_bgp_dragent_config.rb
@@ -0,0 +1,18 @@
+Puppet::Type.newtype(:neutron_bgp_dragent_config) do
+
+ ensurable
+
+ newparam(:name, :namevar => true) do
+ desc 'Section/setting name to manage from bgp_dragent.ini'
+ newvalues(/\S+\/\S+/)
+ end
+
+ newproperty(:value) do
+ desc 'The value of the setting to be defined.'
+ munge do |value|
+ value = value.to_s.strip
+ value.capitalize! if value =~ /^(true|false)$/i
+ value
+ end
+ end
+end
diff --git a/manifests/bgp.pp b/manifests/bgp.pp
new file mode 100644
index 0000000..d61656c
--- /dev/null
+++ b/manifests/bgp.pp
@@ -0,0 +1,36 @@
+# == Class: neutron::bgp
+#
+# Sets up bgp dynamic-routing agent.
+#
+# === Parameters
+#
+# [*bgp_router_id*]
+# (required) The BGP router_id
+#
+# [*bgp_speaker_driver*]
+# (required) The BGP speaker driver
+#
+class neutron::bgp (
+ $bgp_router_id,
+ $bgp_speaker_driver,
+ $service_ensure = 'running',
+ $enable = true,
+) {
+
+ include neutron::params
+
+ Neutron_config<||> ~> Service['neutron-bgp-dragent']
+ Neutron_bgp_dragent_config<||> ~> Service['neutron-bgp-dragent']
+
+ neutron_bgp_dragent_config {
+ 'bgp/bgp_router_id': value => $neutron_bgp_router_id;
+ 'bgp/bgp_speaker_driver': value => $neutron_bgp_speaker_driver;
+ }
+
+ service { 'neutron-bgp-dragent':
+ ensure => $service_ensure,
+ name => $::neutron::params::bgp_dragent_service,
+ enable => $enable,
+ require => Class['neutron'],
+ }
+}
diff --git a/manifests/params.pp b/manifests/params.pp
index aeb5c66..d51a23c 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -41,6 +41,7 @@ class neutron::params {
$router_scheduler_driver = 'neutron.scheduler.l3_agent_scheduler.HostBasedScheduler'
$network_scheduler_driver = 'neutron.scheduler.dhcp_agent_scheduler.HostBasedScheduler'
$router_status_managed = true
+ $bgp_dragent_service = 'neutron-bgp-dragent'
# CentOS is in the Redhat osfamily
if($::osfamily == 'Redhat') {
--
1.8.3.1

64
config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0006-Add-parameters-to-classes.patch
View File

@ -1,64 +0,0 @@
From c74cce7e2b7aa268f8f9b2238e662879701fe9d4 Mon Sep 17 00:00:00 2001
From: Joseph Richard <Joseph.Richard@windriver.com>
Date: Fri, 10 Nov 2017 11:31:50 -0500
Subject: [PATCH 6/8] Add parameters to classes
---
manifests/init.pp | 2 ++
manifests/server.pp | 13 +++++++++++++
2 files changed, 15 insertions(+)
diff --git a/manifests/init.pp b/manifests/init.pp
index 78b994b..4e76091 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -449,6 +449,7 @@ class neutron (
$fm_driver = 'neutron.drivers.fm.NoopFmDriver',
$vlan_transparent = false,
$pnet_audit_enabled = true,
+ $log_format = '[%(name)s] %(message)s',
# DEPRECATED PARAMETERS
$rabbit_password = $::os_service_default,
$rabbit_host = $::os_service_default,
@@ -537,6 +538,7 @@ instead.")
'DEFAULT/host_driver': value => $host_driver;
'DEFAULT/fm_driver': value => $fm_driver;
'DEFAULT/vlan_transparent': value => $vlan_transparent;
+ 'DEFAULT/log_format': value => $log_format;
'pnet_connectivity/pnet_audit_enabled': value => $pnet_audit_enabled;
}
diff --git a/manifests/server.pp b/manifests/server.pp
index 8a1a3f7..b2cc64c 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -258,6 +258,7 @@ class neutron::server (
$enable_proxy_headers_parsing = $::os_service_default,
# WRS
$router_status_managed = $neutron::params::router_status_managed,
+ $vhost_user_enabled = true,
# DEPRECATED PARAMETERS
$log_dir = undef,
$log_file = undef,
@@ -378,6 +379,18 @@ class neutron::server (
}
}
+ # WRS
+ if (str2bool($::is_virtual)) {
+ $vhost_user_enabled_real = false
+ } else {
+ $vhost_user_enabled_real = $vhost_user_enabled
+ }
+
+ neutron_config {
+ # Set to false on virtualbox, true otherwise
+ 'vhost/vhost_user_enabled': value => $vhost_user_enabled_real;
+ }
+
if ($auth_strategy == 'keystone') {
include ::neutron::keystone::authtoken
--
1.8.3.1

27
config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0007-update-neutron-bgp-to-use-class-variables.patch
View File

@ -1,27 +0,0 @@
From 535eddc2aae95719cf40becca35058f7670ebb4e Mon Sep 17 00:00:00 2001
From: Joseph Richard <Joseph.Richard@windriver.com>
Date: Fri, 10 Nov 2017 11:31:51 -0500
Subject: [PATCH 7/8] update neutron bgp to use class variables
---
manifests/bgp.pp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/manifests/bgp.pp b/manifests/bgp.pp
index d61656c..07029f3 100644
--- a/manifests/bgp.pp
+++ b/manifests/bgp.pp
@@ -23,8 +23,8 @@ class neutron::bgp (
Neutron_bgp_dragent_config<||> ~> Service['neutron-bgp-dragent']
neutron_bgp_dragent_config {
- 'bgp/bgp_router_id': value => $neutron_bgp_router_id;
- 'bgp/bgp_speaker_driver': value => $neutron_bgp_speaker_driver;
+ 'bgp/bgp_router_id': value => $bgp_router_id;
+ 'bgp/bgp_speaker_driver': value => $bgp_speaker_driver;
}
service { 'neutron-bgp-dragent':
--
1.8.3.1

45
config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0008-dvr-allow-base-mac-address-to-be-configured.patch
View File

@ -1,45 +0,0 @@
From b72db6b2d737e48129f06ad63e577a4489b66b77 Mon Sep 17 00:00:00 2001
From: Joseph Richard <Joseph.Richard@windriver.com>
Date: Fri, 10 Nov 2017 11:31:51 -0500
Subject: [PATCH 8/8] dvr allow base mac address to be configured
---
manifests/init.pp | 2 ++
spec/classes/neutron_init_spec.rb | 1 +
2 files changed, 3 insertions(+)
diff --git a/manifests/init.pp b/manifests/init.pp
index 4e76091..23ca45f 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -383,6 +383,7 @@ class neutron (
$service_plugins = $::os_service_default,
$auth_strategy = 'keystone',
$base_mac = $::os_service_default,
+ $dvr_base_mac = $::os_service_default,
$dhcp_lease_duration = $::os_service_default,
$host = $::os_service_default,
$dns_domain = $::os_service_default,
@@ -521,6 +522,7 @@ instead.")
'DEFAULT/auth_strategy': value => $auth_strategy;
'DEFAULT/core_plugin': value => $core_plugin;
'DEFAULT/base_mac': value => $base_mac;
+ 'DEFAULT/dvr_base_mac': value => $dvr_base_mac;
'DEFAULT/dhcp_lease_duration': value => $dhcp_lease_duration;
'DEFAULT/host': value => $host;
'DEFAULT/dns_domain': value => $dns_domain;
diff --git a/spec/classes/neutron_init_spec.rb b/spec/classes/neutron_init_spec.rb
index 3854313..b4a53fa 100644
--- a/spec/classes/neutron_init_spec.rb
+++ b/spec/classes/neutron_init_spec.rb
@@ -140,6 +140,7 @@ describe 'neutron' do
is_expected.to contain_neutron_config('DEFAULT/auth_strategy').with_value('keystone')
is_expected.to contain_neutron_config('DEFAULT/core_plugin').with_value( params[:core_plugin] )
is_expected.to contain_neutron_config('DEFAULT/base_mac').with_value('<SERVICE DEFAULT>')
+ is_expected.to contain_neutron_config('DEFAULT/dvr_base_mac').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_config('DEFAULT/dhcp_lease_duration').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_config('DEFAULT/host').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_config('DEFAULT/dns_domain').with_value('<SERVICE DEFAULT>')
--
1.8.3.1

64
config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0009-add-support-for-networking-sfc.patch
View File

@ -1,64 +0,0 @@
From df39f5643e0b8d1c2e689328f134b4f836aae8e3 Mon Sep 17 00:00:00 2001
From: Steven Webster <steven.webster@windriver.com>
Date: Fri, 5 Jan 2018 11:45:19 -0500
Subject: [PATCH 1/1] Puppet support for SFC
---
manifests/sfc.pp | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
create mode 100644 manifests/sfc.pp
diff --git a/manifests/sfc.pp b/manifests/sfc.pp
new file mode 100644
index 0000000..3220e0c
--- /dev/null
+++ b/manifests/sfc.pp
@@ -0,0 +1,45 @@
+# == Class: neutron::sfc
+#
+# Sets up service function chaining.
+#
+# === Parameters
+#
+# [*sfc_drivers*]
+# (required) The SFC driver
+#
+# [*flowclassifier_drivers*]
+# (required) The flowclassifier driver
+#
+# [*quota_flow_classifier*]
+# (optional) The quota for flow classifiers
+#
+# [*quota_port_chain*]
+# (optional) The quota for port chains
+#
+# [*quota_port_pair_group*]
+# (optional) The quota for port pair groups
+#
+# [*quota_port_pair*]
+# (optional) The quota for port pairs
+#
+class neutron::sfc (
+ $sfc_drivers,
+ $flowclassifier_drivers,
+ $quota_flow_classifier = $::os_service_default,
+ $quota_port_chain = $::os_service_default,
+ $quota_port_pair_group = $::os_service_default,
+ $quota_port_pair = $::os_service_default,
+) {
+
+ include neutron::params
+
+ neutron_config {
+ 'sfc/drivers': value => $sfc_drivers;
+ 'flowclassifier/drivers': value => $flowclassifier_drivers;
+ 'quotas/quota_flow_classifier': value => $quota_flow_classifier;
+ 'quotas/quota_port_chain': value => $quota_port_chain;
+ 'quotas/quota_port_pair_group': value => $quota_port_pair_group;
+ 'quotas/quota_port_pair': value => $quota_port_pair;
+ }
+
+}
--
1.8.3.1

46
config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0010-restore-ovs-service-parameters.patch
View File

@ -1,46 +0,0 @@
From dc4b592359fd30045797c26f3d9a99e191a932cc Mon Sep 17 00:00:00 2001
From: Matt Peters <matt.peters@windriver.com>
Date: Fri, 1 Jun 2018 20:26:20 -0500
Subject: [PATCH] 0010-restore-ovs-service-parameters.patch
---
manifests/params.pp | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/manifests/params.pp b/manifests/params.pp
index 858e3fa..22320e5 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -7,7 +7,7 @@ class neutron::params {
$client_package = 'python-neutronclient'
$server_service = 'neutron-server'
- #$ovs_agent_service = 'neutron-openvswitch-agent'
+ $ovs_agent_service = 'neutron-openvswitch-agent'
#$linuxbridge_agent_service = 'neutron-linuxbridge-agent'
#$cisco_config_file = '/etc/neutron/plugins/cisco/cisco_plugins.ini'
$opencontrail_plugin_package = 'neutron-plugin-contrail'
@@ -37,7 +37,6 @@ class neutron::params {
$l2gw_agent_service = 'neutron-l2gw-agent'
$nsx_plugin_package = 'vmware-nsx'
$nsx_config_file = '/etc/neutron/plugins/vmware/nsx.ini'
- $vswitch_agent_service = ''
$router_scheduler_driver = 'neutron.scheduler.l3_agent_scheduler.HostBasedScheduler'
$network_scheduler_driver = 'neutron.scheduler.dhcp_agent_scheduler.HostBasedScheduler'
$router_status_managed = true
@@ -50,9 +49,9 @@ class neutron::params {
$server_package = false
#$ml2_server_package = 'openstack-neutron-ml2'
$ml2_server_package = false
- #$ovs_agent_package = false
- #$ovs_server_package = 'openstack-neutron-openvswitch'
- #$ovs_cleanup_service = 'neutron-ovs-cleanup'
+ $ovs_agent_package = false
+ $ovs_server_package = 'openstack-neutron-openvswitch'
+ $ovs_cleanup_service = 'neutron-ovs-cleanup'
#$libnl_package = 'libnl'
#$package_provider = 'rpm'
#$linuxbridge_agent_package = false
--
1.8.3.1

24
config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/patches/0011-unset-tunnel_types-when-tunneling-disabled.patch
View File

@ -1,24 +0,0 @@
From efc8886902108994a799ab4bf7c5a8ddec0c0a8b Mon Sep 17 00:00:00 2001
From: Matt Peters <matt.peters@windriver.com>
Date: Sat, 26 May 2018 09:02:35 -0500
Subject: [PATCH] unset tunnel_types when tunneling disabled
---
manifests/agents/ml2/ovs.pp | 1 +
1 file changed, 1 insertion(+)
diff --git a/manifests/agents/ml2/ovs.pp b/manifests/agents/ml2/ovs.pp
index a10c7b5..f7c19c2 100644
--- a/manifests/agents/ml2/ovs.pp
+++ b/manifests/agents/ml2/ovs.pp
@@ -310,6 +310,7 @@ class neutron::agents::ml2::ovs (
'ovs/local_ip': ensure => absent;
'ovs/int_peer_patch_port': ensure => absent;
'ovs/tun_peer_patch_port': ensure => absent;
+ 'agent/tunnel_types': ensure => absent;
}
}
--
1.8.3.1

1
config/puppet-modules/openstack/puppet-neutron-11.3.0/centos/srpm_path
View File

@ -1 +0,0 @@
mirror:Source/puppet-neutron-11.3.0-1.el7.src.rpm

1
config/puppet-modules/openstack/puppet-nova-11.4.0/centos/build_srpm.data
View File

@ -1 +0,0 @@
TIS_PATCH_VER=8

25
config/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
View File

@ -1,25 +0,0 @@
From 2d2bc32008adca8f1dff6a9539003aaea0615542 Mon Sep 17 00:00:00 2001
From: Jack Ding <jack.ding@windriver.com>
Date: Fri, 3 Nov 2017 12:15:00 -0400
Subject: [PATCH 1/4] Update package versioning for TIS format
---
SPECS/puppet-nova.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/puppet-nova.spec b/SPECS/puppet-nova.spec
index 5950895..4dd32c5 100644
--- a/SPECS/puppet-nova.spec
+++ b/SPECS/puppet-nova.spec
@@ -1,7 +1,7 @@
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
Name: puppet-nova
Version: 11.4.0
-Release: 1%{?dist}
+Release: 1.el7%{?_tis_dist}.%{tis_patch_ver}
Summary: Puppet module for OpenStack Nova
License: ASL 2.0
--
1.8.3.1

34
config/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0002-Roll-up-TIS-patches.patch
View File

@ -1,34 +0,0 @@
From 6f3c7142899b780c1beeb1634c1265d2fef0e88c Mon Sep 17 00:00:00 2001
From: Jack Ding <jack.ding@windriver.com>
Date: Fri, 3 Nov 2017 12:21:53 -0400
Subject: [PATCH 2/4] Roll up TIS patches
---
SPECS/puppet-nova.spec | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/SPECS/puppet-nova.spec b/SPECS/puppet-nova.spec
index 4dd32c5..e209d03 100644
--- a/SPECS/puppet-nova.spec
+++ b/SPECS/puppet-nova.spec
@@ -9,6 +9,8 @@ URL: https://launchpad.net/puppet-nova
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz
+Patch0001: 0001-Roll-up-TIS-patches.patch
+
BuildArch: noarch
Requires: puppet-cinder
@@ -28,6 +30,8 @@ Puppet module for OpenStack Nova
%prep
%setup -q -n openstack-nova-%{upstream_version}
+%patch0001 -p1
+
find . -type f -name ".*" -exec rm {} +
find . -size 0 -exec rm {} +
find . \( -name "*.pl" -o -name "*.sh" \) -exec chmod +x {} +
--
1.8.3.1

32
config/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0003-upstreamable-fix-syntax-error-for-until_complete_rea.patch
View File

@ -1,32 +0,0 @@
From f648b2a96fb175766cded083516d4cd73e2207b1 Mon Sep 17 00:00:00 2001
From: Jack Ding <jack.ding@windriver.com>
Date: Fri, 3 Nov 2017 12:23:09 -0400
Subject: [PATCH 3/4] upstreamable: fix syntax error for until_complete_real
---
SPECS/puppet-nova.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/puppet-nova.spec b/SPECS/puppet-nova.spec
index e209d03..9bd97b0 100644
--- a/SPECS/puppet-nova.spec
+++ b/SPECS/puppet-nova.spec
@@ -10,6 +10,7 @@ URL: https://launchpad.net/puppet-nova
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz
Patch0001: 0001-Roll-up-TIS-patches.patch
+Patch0002: 0002-upstreamable-fix-syntax-error-for-until_complete_rea.patch
BuildArch: noarch
@@ -31,6 +32,7 @@ Puppet module for OpenStack Nova
%setup -q -n openstack-nova-%{upstream_version}
%patch0001 -p1
+%patch0002 -p1
find . -type f -name ".*" -exec rm {} +
find . -size 0 -exec rm {} +
--
1.8.3.1

34
config/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0004-Setup-simple-cell.patch
View File

@ -1,34 +0,0 @@
From 2909066051cfd5f4813d2d431b0bbea44e8022f0 Mon Sep 17 00:00:00 2001
From: Jack Ding <jack.ding@windriver.com>
Date: Fri, 3 Nov 2017 12:24:53 -0400
Subject: [PATCH 4/4] Setup simple cell
---
SPECS/puppet-nova.spec | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/SPECS/puppet-nova.spec b/SPECS/puppet-nova.spec
index 9bd97b0..f20b9a5 100644
--- a/SPECS/puppet-nova.spec
+++ b/SPECS/puppet-nova.spec
@@ -11,6 +11,8 @@ Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_versio
Patch0001: 0001-Roll-up-TIS-patches.patch
Patch0002: 0002-upstreamable-fix-syntax-error-for-until_complete_rea.patch
+Patch0003: 0003-Create-nova_cell0-database.patch
+Patch0004: 0004-Filter-out-warnings-in-nova-manage-cell_v2-list_cell.patch
BuildArch: noarch
@@ -33,6 +35,8 @@ Puppet module for OpenStack Nova
%patch0001 -p1
%patch0002 -p1
+%patch0003 -p1
+%patch0004 -p1
find . -type f -name ".*" -exec rm {} +
find . -size 0 -exec rm {} +
--
1.8.3.1

32
config/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0005-fix-pci-and-compute-pci.patch
View File

@ -1,32 +0,0 @@
From e6242033b356aad8a27599184e98033bf2d2cf1d Mon Sep 17 00:00:00 2001
From: Jack Ding <jack.ding@windriver.com>
Date: Fri, 3 Nov 2017 16:45:06 -0400
Subject: [PATCH] fix pci and compute::pci
---
SPECS/puppet-nova.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/puppet-nova.spec b/SPECS/puppet-nova.spec
index f20b9a5..b7d70b5 100644
--- a/SPECS/puppet-nova.spec
+++ b/SPECS/puppet-nova.spec
@@ -13,6 +13,7 @@ Patch0001: 0001-Roll-up-TIS-patches.patch
Patch0002: 0002-upstreamable-fix-syntax-error-for-until_complete_rea.patch
Patch0003: 0003-Create-nova_cell0-database.patch
Patch0004: 0004-Filter-out-warnings-in-nova-manage-cell_v2-list_cell.patch
+Patch0005: 0005-fix-pci-and-compute-pci.patch
BuildArch: noarch
@@ -37,6 +38,7 @@ Puppet module for OpenStack Nova
%patch0002 -p1
%patch0003 -p1
%patch0004 -p1
+%patch0005 -p1
find . -type f -name ".*" -exec rm {} +
find . -size 0 -exec rm {} +
--
1.8.3.1

26
config/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0006-Create-Nova-ironic-conf.patch
View File

@ -1,26 +0,0 @@
commit 0aefcfec6930ed8fe4752c6a3ef2047fb7f0a052
Author: Shoaib Nasir <shoaib.nasir@windriver.com>
Date: Wed Dec 6 19:15:34 2017 -0500
Create the nova-ironic.conf patch
diff --git a/SPECS/puppet-nova.spec b/SPECS/puppet-nova.spec
index b7d70b5..2271824 100644
--- a/SPECS/puppet-nova.spec
+++ b/SPECS/puppet-nova.spec
@@ -14,6 +14,7 @@ Patch0002: 0002-upstreamable-fix-syntax-error-for-until_complete_rea.patch
Patch0003: 0003-Create-nova_cell0-database.patch
Patch0004: 0004-Filter-out-warnings-in-nova-manage-cell_v2-list_cell.patch
Patch0005: 0005-fix-pci-and-compute-pci.patch
+Patch0006: 0006-Create-Nova-ironic-conf.patch
BuildArch: noarch
@@ -39,6 +40,7 @@ Puppet module for OpenStack Nova
%patch0003 -p1
%patch0004 -p1
%patch0005 -p1
+%patch0006 -p1
find . -type f -name ".*" -exec rm {} +
find . -size 0 -exec rm {} +

32
config/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0007-remove-joshuabaird-ipaclient-requirement.patch
View File

@ -1,32 +0,0 @@
From d770b08b19314844de13b58f7ec6aba876c55cdc Mon Sep 17 00:00:00 2001
From: Al Bailey <Al.Bailey@windriver.com>
Date: Thu, 4 Jan 2018 10:10:50 -0600
Subject: [PATCH] remove joshuabaird-ipaclient requirement
---
SPECS/puppet-nova.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/puppet-nova.spec b/SPECS/puppet-nova.spec
index 2271824..88577f3 100644
--- a/SPECS/puppet-nova.spec
+++ b/SPECS/puppet-nova.spec
@@ -15,6 +15,7 @@ Patch0003: 0003-Create-nova_cell0-database.patch
Patch0004: 0004-Filter-out-warnings-in-nova-manage-cell_v2-list_cell.patch
Patch0005: 0005-fix-pci-and-compute-pci.patch
Patch0006: 0006-Create-Nova-ironic-conf.patch
+Patch0007: 0007-Remove-joshuabaird-ipaclient-from-puppet-nova-requir.patch
BuildArch: noarch
@@ -41,6 +42,7 @@ Puppet module for OpenStack Nova
%patch0004 -p1
%patch0005 -p1
%patch0006 -p1
+%patch0007 -p1
find . -type f -name ".*" -exec rm {} +
find . -size 0 -exec rm {} +
--
1.8.3.1

32
config/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0008-Add-pci_weight_multiple-to-scheduler-filter.patch
View File

@ -1,32 +0,0 @@
From dde9c5162827712ad9a5cc1855460e40fffdc3e2 Mon Sep 17 00:00:00 2001
From: Al Bailey <Al.Bailey@windriver.com>
Date: Wed, 14 Mar 2018 10:56:25 -0500
Subject: [PATCH] Add pci_weight_multiple to scheduler filter
---
SPECS/puppet-nova.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/puppet-nova.spec b/SPECS/puppet-nova.spec
index 88577f3..fc7ec1f 100644
--- a/SPECS/puppet-nova.spec
+++ b/SPECS/puppet-nova.spec
@@ -16,6 +16,7 @@ Patch0004: 0004-Filter-out-warnings-in-nova-manage-cell_v2-list_cell.patch
Patch0005: 0005-fix-pci-and-compute-pci.patch
Patch0006: 0006-Create-Nova-ironic-conf.patch
Patch0007: 0007-Remove-joshuabaird-ipaclient-from-puppet-nova-requir.patch
+Patch0008: 0008-Adding-pci_weight_multiple-to-nova-scheduler-filter.patch
BuildArch: noarch
@@ -43,6 +44,7 @@ Puppet module for OpenStack Nova
%patch0005 -p1
%patch0006 -p1
%patch0007 -p1
+%patch0008 -p1
find . -type f -name ".*" -exec rm {} +
find . -size 0 -exec rm {} +
--
1.8.3.1

26
config/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0009-Remove-SerialConsole-from-NovaConf.patch
View File

@ -1,26 +0,0 @@
commit 9ff6f16a0f440832ef6b52162a717f2c303baace
Author: Shoaib Nasir <shoaib.nasir@windriver.com>
Date: Thu Mar 15 15:00:46 2018 -0400
WRS: 0009-Remove-SerialConsole-from-NovaConf.patch
diff --git a/SPECS/puppet-nova.spec b/SPECS/puppet-nova.spec
index fc7ec1f..dea8857 100644
--- a/SPECS/puppet-nova.spec
+++ b/SPECS/puppet-nova.spec
@@ -17,6 +17,7 @@ Patch0005: 0005-fix-pci-and-compute-pci.patch
Patch0006: 0006-Create-Nova-ironic-conf.patch
Patch0007: 0007-Remove-joshuabaird-ipaclient-from-puppet-nova-requir.patch
Patch0008: 0008-Adding-pci_weight_multiple-to-nova-scheduler-filter.patch
+Patch0009: 0009-Remove-SerialConsole-from-NovaConf.patch
BuildArch: noarch
@@ -45,6 +46,7 @@ Puppet module for OpenStack Nova
%patch0006 -p1
%patch0007 -p1
%patch0008 -p1
+%patch0009 -p1
find . -type f -name ".*" -exec rm {} +
find . -size 0 -exec rm {} +

Some files were not shown because too many files have changed in this diff Show More