diff --git a/config/puppet-modules/puppet-stdlib-4.12.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/config/puppet-modules/puppet-stdlib-4.12.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
index 8d667c260..469513442 100644
--- a/config/puppet-modules/puppet-stdlib-4.12.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
+++ b/config/puppet-modules/puppet-stdlib-4.12.0/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
@@ -1,25 +1,25 @@
-From 3b29074ca269b8246a7f9bd5ad8468c1b7e54dc5 Mon Sep 17 00:00:00 2001
+From beb4d7f0c2a6d19e863194ea8ec999f815557035 Mon Sep 17 00:00:00 2001
From: Don Penney <don.penney@windriver.com>
Date: Tue, 3 Jan 2017 13:45:43 -0500
-Subject: [PATCH] Update package versioning for TIS format
+Subject: [PATCH 1/2] Update package versioning for TIS format
---
SPECS/puppet-stdlib.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/puppet-stdlib.spec b/SPECS/puppet-stdlib.spec
-index baab15b..0261e5d 100644
+index 77b06f9..4947330 100644
--- a/SPECS/puppet-stdlib.spec
+++ b/SPECS/puppet-stdlib.spec
-@@ -8,7 +8,7 @@
-
+@@ -2,7 +2,7 @@
+ %define upstream_name puppetlabs-stdlib
Name: puppet-stdlib
- Version: 4.13.1
--Release: 2%{?alphatag}%{?dist}
-+Release: 2.dcef77agit.el7%{?_tis_dist}.%{tis_patch_ver}
+ Version: 4.18.0
+-Release: 2%{?dist}
++Release: 2.el7%{?_tis_dist}.%{tis_patch_ver}
Summary: Standard library of resources for Puppet modules.
- License: Apache-2.0
+ License: ASL 2.0
--
-1.8.3.1
+2.7.4
diff --git a/config/puppet-modules/puppet-stdlib-4.12.0/centos/meta_patches/0002-Add-TIS-Patches.patch b/config/puppet-modules/puppet-stdlib-4.12.0/centos/meta_patches/0002-Add-TIS-Patches.patch
index 234cea67a..b9bf97411 100644
--- a/config/puppet-modules/puppet-stdlib-4.12.0/centos/meta_patches/0002-Add-TIS-Patches.patch
+++ b/config/puppet-modules/puppet-stdlib-4.12.0/centos/meta_patches/0002-Add-TIS-Patches.patch
@@ -1,26 +1,26 @@
-From 36f161731c1041805d4d3de98a0f280917692757 Mon Sep 17 00:00:00 2001
+From c7d61832d0ab7eb0d8b7656d0c1bc0eda036331b Mon Sep 17 00:00:00 2001
From: Don Penney <don.penney@windriver.com>
Date: Mon, 1 May 2017 14:39:38 -0400
-Subject: [PATCH] Add TIS Patches
+Subject: [PATCH 2/2] Add TIS Patches
---
SPECS/puppet-stdlib.spec | 3 +++
1 file changed, 3 insertions(+)
diff --git a/SPECS/puppet-stdlib.spec b/SPECS/puppet-stdlib.spec
-index 769c0ef..7304088 100644
+index 4947330..19e9599 100644
--- a/SPECS/puppet-stdlib.spec
+++ b/SPECS/puppet-stdlib.spec
-@@ -15,6 +15,8 @@ URL: https://github.com/puppetlabs/puppetlabs-stdlib
+@@ -10,6 +10,8 @@ URL: https://github.com/puppetlabs/puppetlabs-stdlib
- Source0: https://github.com/puppetlabs/%{upstream_name}/archive/%{commit}.tar.gz#/%{upstream_name}-%{shortcommit}.tar.gz
+ Source0: https://github.com/puppetlabs/%{upstream_name}/archive/%{version}.tar.gz
+Patch0001: 0001-Filter-password-in-logs.patch
+
BuildArch: noarch
Requires: puppet >= 2.7.0
-@@ -24,6 +26,7 @@ Standard library of resources for Puppet modules.
+@@ -19,6 +21,7 @@ Standard library of resources for Puppet modules.
%prep
%setup -q -n %{upstream_name}-%{upstream_version}
@@ -29,5 +29,5 @@ index 769c0ef..7304088 100644
find . -type f -name ".*" -exec rm {} +
find . -size 0 -exec rm {} +
--
-1.8.3.1
+2.7.4
diff --git a/config/puppet-modules/puppet-stdlib-4.12.0/centos/meta_patches/0003-Improve-ipv6-support-for-type.patch b/config/puppet-modules/puppet-stdlib-4.12.0/centos/meta_patches/0003-Improve-ipv6-support-for-type.patch
deleted file mode 100644
index 57154e223..000000000
--- a/config/puppet-modules/puppet-stdlib-4.12.0/centos/meta_patches/0003-Improve-ipv6-support-for-type.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 8e8ef8e37a71d79b413d07c135823786f402e89a Mon Sep 17 00:00:00 2001
-From: Jack Ding <jack.ding@windriver.com>
-Date: Tue, 15 May 2018 13:10:35 -0400
-Subject: [PATCH] Improve ipv6 support for type
-
----
- SPECS/puppet-stdlib.spec | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/SPECS/puppet-stdlib.spec b/SPECS/puppet-stdlib.spec
-index 7304088..d62745e 100644
---- a/SPECS/puppet-stdlib.spec
-+++ b/SPECS/puppet-stdlib.spec
-@@ -16,6 +16,7 @@ URL: https://github.com/puppetlabs/puppetlabs-stdlib
- Source0: https://github.com/puppetlabs/%{upstream_name}/archive/%{commit}.tar.gz#/%{upstream_name}-%{shortcommit}.tar.gz
-
- Patch0001: 0001-Filter-password-in-logs.patch
-+Patch0002: 0002-Improve-ipv6-support-for-type.patch
-
- BuildArch: noarch
-
-@@ -27,6 +28,7 @@ Standard library of resources for Puppet modules.
- %prep
- %setup -q -n %{upstream_name}-%{upstream_version}
- %patch0001 -p1
-+%patch0002 -p1
-
- find . -type f -name ".*" -exec rm {} +
- find . -size 0 -exec rm {} +
---
-1.8.3.1
-
diff --git a/config/puppet-modules/puppet-stdlib-4.12.0/centos/meta_patches/PATCH_ORDER b/config/puppet-modules/puppet-stdlib-4.12.0/centos/meta_patches/PATCH_ORDER
index 380023ac8..0403df317 100644
--- a/config/puppet-modules/puppet-stdlib-4.12.0/centos/meta_patches/PATCH_ORDER
+++ b/config/puppet-modules/puppet-stdlib-4.12.0/centos/meta_patches/PATCH_ORDER
@@ -1,3 +1,2 @@
0001-Update-package-versioning-for-TIS-format.patch
0002-Add-TIS-Patches.patch
-0003-Improve-ipv6-support-for-type.patch
diff --git a/config/puppet-modules/puppet-stdlib-4.12.0/centos/patches/0002-Improve-ipv6-support-for-type.patch b/config/puppet-modules/puppet-stdlib-4.12.0/centos/patches/0002-Improve-ipv6-support-for-type.patch
deleted file mode 100644
index 26f09752d..000000000
--- a/config/puppet-modules/puppet-stdlib-4.12.0/centos/patches/0002-Improve-ipv6-support-for-type.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 1385e617ddc9e82cc408c58bb1ae7cecbdf00465 Mon Sep 17 00:00:00 2001
-From: Jack Ding <jack.ding@windriver.com>
-Date: Tue, 15 May 2018 13:02:24 -0400
-Subject: [PATCH] Improve ipv6 support for type
-
-Fix from upstream 496d196 to add support for collapsed ipv6 address like 'abcd::3'.
----
- types/compat/ipv6.pp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/types/compat/ipv6.pp b/types/compat/ipv6.pp
-index 18b148d..8b82f1a 100644
---- a/types/compat/ipv6.pp
-+++ b/types/compat/ipv6.pp
-@@ -1 +1 @@
--type Stdlib::Compat::Ipv6 = Pattern[/^(?:(?:[\da-f]{1,4}:){7}[\da-f]{1,4}|((?:[\da-f]{1,4}:){6})(\d+)\.(\d+)\.(\d+)\.(\d+))$/]
-+type Stdlib::Compat::Ipv6 = Pattern[/\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$/]
---
-1.8.3.1
-
diff --git a/config/puppet-modules/puppet-stdlib-4.12.0/centos/srpm_path b/config/puppet-modules/puppet-stdlib-4.12.0/centos/srpm_path
index 993db8eb6..9f1b613fd 100644
--- a/config/puppet-modules/puppet-stdlib-4.12.0/centos/srpm_path
+++ b/config/puppet-modules/puppet-stdlib-4.12.0/centos/srpm_path
@@ -1 +1 @@
-mirror:Source/puppet-stdlib-4.13.1-2.dcef77agit.el7.src.rpm
+mirror:Source/puppet-stdlib-4.18.0-2.el7.src.rpm