Skip to content

Commit a77d7b0

Browse files
author
rsmekala
committed
Merge branch 'master' of https://github.com/Juniper/puppet-netdev-stdlib-junos into container_logic
# Conflicts: # lib/facter/productmodel.rb # lib/puppet/provider/junos/junos_netdev_device.rb
2 parents 5ddea6f + e6dc223 commit a77d7b0

File tree

4 files changed

+18
-5
lines changed

4 files changed

+18
-5
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,9 @@
4141
- Issue with netdev_lag creation and deletion - interfaces arriving as array
4242
entries changed to look like normal interfaces to netconf.
4343
* Upgrade to 2.0.5
44+
45+
### 2019-12-05
46+
* Features:
47+
- Added support to run puppet-agent from a container
48+
- Added a new fact conatiner: `docker` or `false` to indicate
49+
if puppet is running in an container environment.

Modulefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name 'juniper-netdev_stdlib_junos'
2-
version '2.0.5'
2+
version '2.1.0'
33
source 'https://github.com/Juniper/puppet-netdev-stdlib-junos'
4-
author 'Jeremy Schulman, Ganesh Nalawade, Juniper Networks'
4+
author 'Raja Shekar Mekala, Juniper Networks'
55
license 'See LICENSE file'
66
summary 'Junos Provider code for Networking Device (netdev stdlib) Library'
77

lib/facter/container.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
Facter.add(:container) do
1414
setcode do
15-
query = ":/docker"
15+
query = "/docker"
1616
arr = File.readlines("/proc/1/cgroup").grep /#{query}/i
1717
if arr.any?
1818
"docker"

metadata.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "juniper-netdev_stdlib_junos",
3-
"version": "2.0.2",
4-
"author": "Jeremy Schulman, Ganesh Nalawade, Juniper Networks",
3+
"version": "2.1.0",
4+
"author": "Raja Shekar Mekala, Juniper Networks",
55
"summary": "Junos Provider code for Networking Device (netdev stdlib) Library",
66
"license": "See LICENSE file",
77
"source": "https://github.com/Juniper/puppet-netdev-stdlib-junos",
@@ -38,5 +38,12 @@
3838
"version_requirement": ">= 1.0.0"
3939
},
4040
{"name":"netdevops/netdev_stdlib","version_requirement":">= 1.0.0"}
41+
],
42+
"tags": [
43+
"juniper",
44+
"junos",
45+
"netdevops",
46+
"network",
47+
"networking"
4148
]
4249
}

0 commit comments

Comments
 (0)