Rush has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/393615 )
Change subject: Revert "openstack: disable notify temporarily"
......................................................................
Revert "openstack: disable notify temporarily"
This reverts commit 19429745a6f776fb319091b5d3ef39adc5d5102d.
Change-Id: If1026465c6a3e335c3d7bce7f263aed057179800
---
M modules/openstack/manifests/designate/service.pp
M modules/openstack/manifests/glance/service.pp
M modules/openstack/manifests/horizon/service.pp
M modules/openstack/manifests/keystone/hooks.pp
M modules/openstack/manifests/keystone/service.pp
M modules/openstack/manifests/nova/compute/service.pp
M modules/openstack/manifests/nova/network/service.pp
M modules/openstack/manifests/nova/scheduler/service.pp
M modules/profile/manifests/openstack/base/pdns/recursor/service.pp
9 files changed, 37 insertions(+), 0 deletions(-)
Approvals:
Rush: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/openstack/manifests/designate/service.pp
b/modules/openstack/manifests/designate/service.pp
index b209f23..404cba2 100644
--- a/modules/openstack/manifests/designate/service.pp
+++ b/modules/openstack/manifests/designate/service.pp
@@ -85,23 +85,27 @@
group => 'designate',
mode => '0440',
content =>
template("openstack/${version}/designate/designate.conf.erb"),
+ notify =>
Service['designate-api','designate-sink','designate-central','designate-mdns','designate-pool-manager'],
require => Package['designate-common'];
'/etc/designate/api-paste.ini':
content =>
template("openstack/${version}/designate/api-paste.ini.erb"),
owner => 'designate',
group => 'designate',
+ notify =>
Service['designate-api','designate-sink','designate-central'],
require => Package['designate-api'],
mode => '0440';
'/etc/designate/policy.json':
source =>
"puppet:///modules/openstack/${version}/designate/policy.json",
owner => 'designate',
group => 'designate',
+ notify =>
Service['designate-api','designate-sink','designate-central'],
require => Package['designate-common'],
mode => '0440';
'/etc/designate/rootwrap.conf':
source =>
"puppet:///modules/openstack/${version}/designate/rootwrap.conf",
owner => 'root',
group => 'root',
+ notify =>
Service['designate-api','designate-sink','designate-central'],
require => Package['designate-common'],
mode => '0440';
}
@@ -138,6 +142,7 @@
group => 'root',
mode => '0544',
content =>
template('openstack/initscripts/designate-pool-manager.upstart.erb'),
+ notify => Service['designate-pool-manager'],
}
file {'/etc/init/designate-mdns.conf':
@@ -146,6 +151,7 @@
group => 'root',
mode => '0544',
content =>
template('openstack/initscripts/designate-mdns.upstart.erb'),
+ notify => Service['designate-mdns'],
}
# include rootwrap.d entries
diff --git a/modules/openstack/manifests/glance/service.pp
b/modules/openstack/manifests/glance/service.pp
index 375507a..5c2d4e8 100644
--- a/modules/openstack/manifests/glance/service.pp
+++ b/modules/openstack/manifests/glance/service.pp
@@ -40,18 +40,21 @@
owner => 'glance',
group => 'nogroup',
mode => '0440',
+ notify => Service['glance-api'],
require => Package['glance'];
'/etc/glance/glance-registry.conf':
content =>
template("openstack/${version}/glance/glance-registry.conf.erb"),
owner => 'glance',
group => 'nogroup',
mode => '0440',
+ notify => Service['glance-registry'],
require => Package['glance'];
'/etc/glance/policy.json':
source =>
"puppet:///modules/openstack/${version}/glance/policy.json",
owner => 'root',
group => 'root',
mode => '0644',
+ notify => Service['glance-api'],
require => Package['glance'];
}
diff --git a/modules/openstack/manifests/horizon/service.pp
b/modules/openstack/manifests/horizon/service.pp
index 3856143..91241d9 100644
--- a/modules/openstack/manifests/horizon/service.pp
+++ b/modules/openstack/manifests/horizon/service.pp
@@ -49,6 +49,7 @@
group => 'horizon',
mode => '0440',
require => Package['openstack-dashboard'],
+ notify => [Service['apache2'], Exec['djangorefresh']],
}
# In the perfect future, Horizon policies will be the same
@@ -60,6 +61,7 @@
group => 'horizon',
mode => '0440',
require => Package['openstack-dashboard'],
+ notify => Service['apache2'],
}
file { '/etc/openstack-dashboard/glance_policy.json':
source =>
"puppet:///modules/openstack/${version}/horizon/glance_policy.json",
@@ -67,6 +69,7 @@
group => 'horizon',
mode => '0440',
require => Package['openstack-dashboard'],
+ notify => Service['apache2'],
}
# We need a horizon-specific keystone policy because horizon does
weird/special
@@ -79,6 +82,7 @@
group => 'horizon',
mode => '0440',
require => Package['openstack-dashboard'],
+ notify => Service['apache2'],
}
file { '/etc/openstack-dashboard/designate_policy.json':
@@ -87,6 +91,7 @@
group => 'horizon',
mode => '0440',
require => Package['openstack-dashboard'],
+ notify => Service['apache2'],
}
# This is a trivial policy file that forbids everything. We'll use it
@@ -98,6 +103,7 @@
group => 'horizon',
mode => '0440',
require => Package['openstack-dashboard'],
+ notify => Service['apache2'],
}
file {
'/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/img/logo.png':
@@ -209,6 +215,7 @@
mode => '0644',
recurse => true,
require => Package['python-designate-dashboard',
'openstack-dashboard'],
+ notify => Exec['djangorefresh'],
}
file {
'/usr/share/openstack-dashboard/openstack_dashboard/local/enabled/_1922_project_proxy_panel.py':
@@ -217,6 +224,7 @@
group => 'root',
mode => '0644',
require => Package['python-designate-dashboard',
'openstack-dashboard'],
+ notify => Exec['djangorefresh'],
}
# sudo dashboard
@@ -227,6 +235,7 @@
mode => '0644',
recurse => true,
require => Package['python-designate-dashboard',
'openstack-dashboard'],
+ notify => Exec['djangorefresh'],
}
file {
'/usr/share/openstack-dashboard/openstack_dashboard/local/enabled/_1926_project_sudo_panel.py':
@@ -235,6 +244,7 @@
group => 'root',
mode => '0644',
require => Package['python-designate-dashboard',
'openstack-dashboard'],
+ notify => Exec['djangorefresh'],
}
file {
'/usr/share/openstack-dashboard/openstack_dashboard/local/enabled/_72_sudoers_add_group.py':
@@ -243,6 +253,7 @@
group => 'root',
mode => '0644',
require => Package['python-designate-dashboard',
'openstack-dashboard'],
+ notify => Exec['djangorefresh'],
}
if $version != 'liberty' {
@@ -255,6 +266,7 @@
group => 'root',
mode => '0644',
require => Package['openstack-dashboard'],
+ notify => Exec['djangorefresh'],
}
}
@@ -286,6 +298,7 @@
path => '/usr/bin',
cwd => '/usr/share/openstack-dashboard',
require => File['/etc/openstack-dashboard/local_settings.py'],
+ notify => Service['apache2'],
refreshonly => true,
}
}
diff --git a/modules/openstack/manifests/keystone/hooks.pp
b/modules/openstack/manifests/keystone/hooks.pp
index 35fbfaa..f109bf6 100644
--- a/modules/openstack/manifests/keystone/hooks.pp
+++ b/modules/openstack/manifests/keystone/hooks.pp
@@ -11,6 +11,7 @@
group => 'root',
mode => '0644',
recurse => true,
+ notify => Service['keystone'],
}
file { '/usr/lib/python2.7/dist-packages/wmfkeystonehooks.egg-info':
@@ -19,5 +20,6 @@
group => 'root',
mode => '0644',
recurse => true,
+ notify => Service['keystone'],
}
}
diff --git a/modules/openstack/manifests/keystone/service.pp
b/modules/openstack/manifests/keystone/service.pp
index d3cf1f6..36eae9a 100644
--- a/modules/openstack/manifests/keystone/service.pp
+++ b/modules/openstack/manifests/keystone/service.pp
@@ -66,36 +66,42 @@
owner => 'keystone',
group => 'keystone',
mode => '0444',
+ notify => Service['keystone'],
require => Package['keystone'];
'/etc/keystone/keystone-paste.ini':
source =>
"puppet:///modules/openstack/${version}/keystone/keystone-paste.ini",
owner => 'root',
group => 'root',
mode => '0644',
+ notify => Service['keystone'],
require => Package['keystone'];
'/etc/keystone/policy.json':
source =>
"puppet:///modules/openstack/${version}/keystone/policy.json",
mode => '0644',
owner => 'root',
group => 'root',
+ notify => Service['keystone'],
require => Package['keystone'];
'/etc/keystone/logging.conf':
source =>
"puppet:///modules/openstack/${version}/keystone/logging.conf",
owner => 'root',
group => 'root',
mode => '0644',
+ notify => Service['keystone'],
require => Package['keystone'];
'/usr/lib/python2.7/dist-packages/wmfkeystoneauth':
source =>
"puppet:///modules/openstack/${version}/keystone/wmfkeystoneauth",
owner => 'root',
group => 'root',
mode => '0644',
+ notify => Service['keystone'],
recurse => true;
'/usr/lib/python2.7/dist-packages/wmfkeystoneauth.egg-info':
source =>
"puppet:///modules/openstack/${version}/keystone/wmfkeystoneauth.egg-info",
owner => 'root',
group => 'root',
mode => '0644',
+ notify => Service['keystone'],
recurse => true;
}
diff --git a/modules/openstack/manifests/nova/compute/service.pp
b/modules/openstack/manifests/nova/compute/service.pp
index b6fb82a..aad8727 100644
--- a/modules/openstack/manifests/nova/compute/service.pp
+++ b/modules/openstack/manifests/nova/compute/service.pp
@@ -139,6 +139,7 @@
group => 'root',
mode => '0444',
content =>
template("openstack/${version}/nova/compute/libvirtd.conf.erb"),
+ notify => Service['libvirt-bin'],
require => Package['nova-compute'],
}
@@ -147,6 +148,7 @@
group => 'root',
mode => '0444',
content =>
template("openstack/${version}/nova/compute/libvirt-bin.default.erb"),
+ notify => Service['libvirt-bin'],
require => Package['nova-compute'],
}
@@ -155,6 +157,7 @@
group => 'root',
mode => '0444',
content =>
template("openstack/${version}/nova/compute/nova-compute.conf.erb"),
+ notify => Service['nova-compute'],
require => Package['nova-compute'],
}
diff --git a/modules/openstack/manifests/nova/network/service.pp
b/modules/openstack/manifests/nova/network/service.pp
index b5e1f39..d9eee9c 100644
--- a/modules/openstack/manifests/nova/network/service.pp
+++ b/modules/openstack/manifests/nova/network/service.pp
@@ -24,6 +24,7 @@
group => 'root',
mode => '0444',
content =>
template("openstack/${version}/nova/network/dnsmasq-nova.conf.erb"),
+ notify => Service['nova-network'],
}
# Firewall is managed by nova-network outside of ferm
@@ -35,6 +36,7 @@
group => 'root',
mode => '0444',
source => 'puppet:///modules/base/firewall/nf_conntrack.conf',
+ notify => Service['nova-network'],
}
# dnsmasq is run manually by nova-network, we don't want the service
running
diff --git a/modules/openstack/manifests/nova/scheduler/service.pp
b/modules/openstack/manifests/nova/scheduler/service.pp
index 56346c2..285406a 100644
--- a/modules/openstack/manifests/nova/scheduler/service.pp
+++ b/modules/openstack/manifests/nova/scheduler/service.pp
@@ -15,6 +15,7 @@
group => 'root',
mode => '0444',
source =>
"puppet:///modules/openstack/${version}/nova/scheduler/scheduler_pool_filter.py",
+ notify => Service['nova-scheduler'],
require => Package['nova-scheduler'],
}
diff --git a/modules/profile/manifests/openstack/base/pdns/recursor/service.pp
b/modules/profile/manifests/openstack/base/pdns/recursor/service.pp
index b958453..7e66951 100644
--- a/modules/profile/manifests/openstack/base/pdns/recursor/service.pp
+++ b/modules/profile/manifests/openstack/base/pdns/recursor/service.pp
@@ -59,6 +59,7 @@
owner => 'root',
group => 'root',
mode => '0444',
+ notify => Service['pdns-recursor'],
content => template('role/labs/dns/db_aliases.erb'),
require => File['/var/zones']
}
--
To view, visit https://gerrit.wikimedia.org/r/393615
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If1026465c6a3e335c3d7bce7f263aed057179800
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Rush <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
