(An Untitled Masterwork)
ActivePublic
Actions

Authored by • ema on Feb 8 2017, 8:35 AM.

Tags

None

Referenced Files

	F5546943:
	Feb 8 2017, 8:35 AM

Subscribers

None

	root@puppetmaster1001:~# puppet-merge
	Fetching new commits from https://gerrit.wikimedia.org/r/p/operations/puppet
	remote: Counting objects: 17602, done
	remote: Finding sources: 100% (6/6)
	remote: Getting sizes: 100% (2/2)
	remote: Compressing objects: 100% (9338/9338)
	remote: Total 6 (delta 3), reused 3 (delta 3)
	Unpacking objects: 100% (6/6), done.
	From https://gerrit.wikimedia.org/r/p/operations/puppet
	2173d86..cef2cb7 production -> origin/production
	HEAD is 2173d868e2e94a3460b2efa8e0690413bfbd56c0, FETCH_HEAD is cef2cb7ea58e85cbe54ac58af9604e43fe7443c8. Reviewing changes...
	diff --git a/modules/base/manifests/service_unit.pp b/modules/base/manifests/service_unit.pp
	index 69a5550..602dc77 100644
	--- a/modules/base/manifests/service_unit.pp
	+++ b/modules/base/manifests/service_unit.pp
	@@ -106,13 +106,12 @@ define base::service_unit (
	}

	# systemd complains if unit files are executable
	- if $initscript == 'systemd' {
	+ if $initscript == 'systemd' or $initscript == 'systemd_override' {
	$i_mode = '0444'
	} else {
	$i_mode = '0544'
	}

	-
	if $systemd_override {
	file { "/etc/systemd/system/${name}.service.d":
	ensure => directory,


	------------------------------
	Ema: base::service_unit: chmod -x systemd overrides (cef2cb7)
	Merge these changes? (yes/no)? yes
	Merging cef2cb7ea58e85cbe54ac58af9604e43fe7443c8...
	git merge --ff-only cef2cb7ea58e85cbe54ac58af9604e43fe7443c8
	Updating 2173d86..cef2cb7
	Fast-forward
	modules/base/manifests/service_unit.pp \| 3 +--
	1 file changed, 1 insertion(+), 2 deletions(-)
	Running git clean to clean any untracked files.
	git clean -dffx -e /private/
	HEAD is now cef2cb7ea58e85cbe54ac58af9604e43fe7443c8.
	/root
	Fetching new commits from https://gerrit.wikimedia.org/r/p/operations/puppet
	HEAD is 2173d868e2e94a3460b2efa8e0690413bfbd56c0, FETCH_HEAD is cef2cb7ea58e85cbe54ac58af9604e43fe7443c8. Reviewing changes...


	------------------------------
	Merging cef2cb7ea58e85cbe54ac58af9604e43fe7443c8...
	git merge --ff-only cef2cb7ea58e85cbe54ac58af9604e43fe7443c8
	Updating 2173d86..cef2cb7
	Fast-forward
	modules/base/manifests/service_unit.pp \| 3 +--
	1 file changed, 1 insertion(+), 2 deletions(-)
	Running git clean to clean any untracked files.
	git clean -dffx -e /private/
	HEAD is now cef2cb7ea58e85cbe54ac58af9604e43fe7443c8.
	/var/lib/git/operations/puppet
	Connection to puppetmaster1002.eqiad.wmnet closed.
	OK: puppet-merge on puppetmaster1002.eqiad.wmnet succeded
	Fetching new commits from https://gerrit.wikimedia.org/r/p/operations/puppet
	error: Ref refs/remotes/origin/production is at cef2cb7ea58e85cbe54ac58af9604e43fe7443c8 but expected f1f7d73185d26d1f89ed83a0045959d67d2eb548
	From https://gerrit.wikimedia.org/r/p/operations/puppet
	! f1f7d73..cef2cb7 production -> origin/production (unable to update local ref)
	Connection to rhodium.eqiad.wmnet closed.

Event Timeline

• ema created this paste.Feb 8 2017, 8:35 AM

(An Untitled Masterwork)ActivePublicActions

Event Timeline

(An Untitled Masterwork)
ActivePublic
Actions