Andrew Bogott has submitted this change and it was merged.
Change subject: Openstack: s/hostname/fqdn/g in the controller vs. spare logic
......................................................................
Openstack: s/hostname/fqdn/g in the controller vs. spare logic
Change-Id: Id4c0ed53223a038835244e659b3b4a28d7ebf721
---
M modules/openstack/manifests/glance/service.pp
M modules/openstack/manifests/nova/conductor.pp
M modules/openstack/manifests/nova/scheduler.pp
3 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/openstack/manifests/glance/service.pp
b/modules/openstack/manifests/glance/service.pp
index 20ed02b..c390ecb 100644
--- a/modules/openstack/manifests/glance/service.pp
+++ b/modules/openstack/manifests/glance/service.pp
@@ -89,7 +89,7 @@
require => File['/home/glancesync/.ssh'],
}
- if $::hostname == hiera('labs_nova_controller') {
+ if $::fqdn == hiera('labs_nova_controller') {
service { 'glance-api':
ensure => running,
require => Package['glance'],
diff --git a/modules/openstack/manifests/nova/conductor.pp
b/modules/openstack/manifests/nova/conductor.pp
index 0800dbf..a422a80 100644
--- a/modules/openstack/manifests/nova/conductor.pp
+++ b/modules/openstack/manifests/nova/conductor.pp
@@ -6,7 +6,7 @@
require => Class['openstack::repo'];
}
- if $::hostname == hiera('labs_nova_controller') {
+ if $::fqdn == hiera('labs_nova_controller') {
service { 'nova-conductor':
ensure => running,
subscribe => File['/etc/nova/nova.conf'],
diff --git a/modules/openstack/manifests/nova/scheduler.pp
b/modules/openstack/manifests/nova/scheduler.pp
index 488757d..496b11b 100644
--- a/modules/openstack/manifests/nova/scheduler.pp
+++ b/modules/openstack/manifests/nova/scheduler.pp
@@ -18,7 +18,7 @@
require => Package['nova-scheduler'],
}
- if $::hostname == hiera('labs_nova_controller') {
+ if $::fqdn == hiera('labs_nova_controller') {
service { 'nova-scheduler':
ensure => running,
subscribe => File['/etc/nova/nova.conf'],
--
To view, visit https://gerrit.wikimedia.org/r/238805
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id4c0ed53223a038835244e659b3b4a28d7ebf721
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
