[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: contain classes for dependency handling

[Rush (Code Review)]

Rush has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/397903 )

Change subject: openstack: contain classes for dependency handling
..


openstack: contain classes for dependency handling

Bug: T171494
Change-Id: I6db063a930517dbc5059dad781488025782cc89e
---
M modules/profile/manifests/openstack/base/clientlib.pp
M modules/profile/manifests/openstack/base/cloudrepo.pp
M modules/profile/manifests/openstack/base/designate/service.pp
M modules/profile/manifests/openstack/base/glance.pp
M modules/profile/manifests/openstack/base/horizon/dashboard.pp
M modules/profile/manifests/openstack/base/keystone/hooks.pp
M modules/profile/manifests/openstack/base/keystone/service.pp
M modules/profile/manifests/openstack/base/nova/common.pp
M modules/profile/manifests/openstack/base/pdns/dns_floating_ip_updater.pp
M modules/profile/manifests/openstack/base/rabbitmq.pp
M modules/profile/manifests/openstack/labtestn/designate/service.pp
M modules/profile/manifests/openstack/labtestn/glance.pp
M modules/profile/manifests/openstack/labtestn/keystone/service.pp
M modules/profile/manifests/openstack/labtestn/nova/common.pp
M modules/profile/manifests/openstack/labtestn/rabbitmq.pp
15 files changed, 28 insertions(+), 5 deletions(-)

Approvals:
  Rush: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/profile/manifests/openstack/base/clientlib.pp 
b/modules/profile/manifests/openstack/base/clientlib.pp
index 87bfc5d..30aea86 100644
--- a/modules/profile/manifests/openstack/base/clientlib.pp
+++ b/modules/profile/manifests/openstack/base/clientlib.pp
@@ -2,9 +2,11 @@
 $version = hiera('profile::openstack::base::version'),
 ) {
 
-class {'openstack::clientlib':
+class {'::openstack::clientlib':
 version => $version
 }
+contain '::openstack::clientlib'
 
-class {'openstack::common':}
+class {'::openstack::common':}
+contain '::openstack::common'
 }
diff --git a/modules/profile/manifests/openstack/base/cloudrepo.pp 
b/modules/profile/manifests/openstack/base/cloudrepo.pp
index 5fbe658..1f1904e 100644
--- a/modules/profile/manifests/openstack/base/cloudrepo.pp
+++ b/modules/profile/manifests/openstack/base/cloudrepo.pp
@@ -4,4 +4,5 @@
 class { '::openstack::cloudrepo':
 version => $version,
 }
+contain '::openstack::cloudrepo'
 }
diff --git a/modules/profile/manifests/openstack/base/designate/service.pp 
b/modules/profile/manifests/openstack/base/designate/service.pp
index b6169c0..c0bc23b 100644
--- a/modules/profile/manifests/openstack/base/designate/service.pp
+++ b/modules/profile/manifests/openstack/base/designate/service.pp
@@ -57,6 +57,7 @@
 keystone_public_port   => $keystone_public_port,
 keystone_auth_port => $keystone_auth_port,
 }
+contain '::openstack::designate::service'
 
 # Open designate API to Labs web UIs and the commandline on labcontrol
 ferm::rule { 'designate-api':
diff --git a/modules/profile/manifests/openstack/base/glance.pp 
b/modules/profile/manifests/openstack/base/glance.pp
index c98d27b..90835b0 100644
--- a/modules/profile/manifests/openstack/base/glance.pp
+++ b/modules/profile/manifests/openstack/base/glance.pp
@@ -17,7 +17,7 @@
 $keystone_admin_uri = "http://${nova_controller}:${auth_port}";
 $keystone_public_uri = "http://${nova_controller}:${public_port}";
 
-class { 'openstack::glance::service':
+class { '::openstack::glance::service':
 version => $version,
 active  => $::fqdn == $nova_controller,
 keystone_admin_uri  => $keystone_admin_uri,
@@ -31,6 +31,7 @@
 glance_data => $glance_data,
 glance_image_dir=> $glance_image_dir,
 }
+contain '::openstack::glance::service'
 
 include ::network::constants
 $prod_networks = join($network::constants::production_networks, ' ')
diff --git a/modules/profile/manifests/openstack/base/horizon/dashboard.pp 
b/modules/profile/manifests/openstack/base/horizon/dashboard.pp
index 0f12da3..82fdd76 100644
--- a/modules/profile/manifests/openstack/base/horizon/dashboard.pp
+++ b/modules/profile/manifests/openstack/base/horizon/dashboard.pp
@@ -9,7 +9,7 @@
 ) {
 
 # TODO: Add openstack::util::envscripts during profile conversion
-class { 'openstack::horizon::service':
+class { '::openstack::horizon::service':
 version => $version,
 nova_controller => $nova_controller,
 wmflabsdotorg_admin => $wmflabsdotorg_admin,
@@ -18,11 +18,13 @@
 ldap_user_pass  => $ldap_user_pass,
 webserver_hostname  => $webserver_hostname,
 }
+contain '::openstack::horizon::service'
 
 #   require => Class['openstack::horizon::service'],
 class {'::openstack::horizon::puppetpanel':
 version => $version,
 }
+contain '::openstack::horizon::p

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: contain classes for dependency handling

[Rush (Code Review)]

Rush has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397903 )

Change subject: openstack: contain classes for dependency handling
..

openstack: contain classes for dependency handling

Bug: T171494
Change-Id: I6db063a930517dbc5059dad781488025782cc89e
---
M modules/profile/manifests/openstack/base/clientlib.pp
M modules/profile/manifests/openstack/base/cloudrepo.pp
M modules/profile/manifests/openstack/base/designate/service.pp
M modules/profile/manifests/openstack/base/glance.pp
M modules/profile/manifests/openstack/base/horizon/dashboard.pp
M modules/profile/manifests/openstack/base/keystone/hooks.pp
M modules/profile/manifests/openstack/base/keystone/service.pp
M modules/profile/manifests/openstack/base/nodepool/service.pp
M modules/profile/manifests/openstack/base/nova/common.pp
M modules/profile/manifests/openstack/base/pdns/dns_floating_ip_updater.pp
M modules/profile/manifests/openstack/base/rabbitmq.pp
M modules/profile/manifests/openstack/labtestn/designate/service.pp
M modules/profile/manifests/openstack/labtestn/glance.pp
M modules/profile/manifests/openstack/labtestn/keystone/service.pp
M modules/profile/manifests/openstack/labtestn/nova/common.pp
M modules/profile/manifests/openstack/labtestn/rabbitmq.pp
16 files changed, 29 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/03/397903/1

diff --git a/modules/profile/manifests/openstack/base/clientlib.pp 
b/modules/profile/manifests/openstack/base/clientlib.pp
index 87bfc5d..30aea86 100644
--- a/modules/profile/manifests/openstack/base/clientlib.pp
+++ b/modules/profile/manifests/openstack/base/clientlib.pp
@@ -2,9 +2,11 @@
 $version = hiera('profile::openstack::base::version'),
 ) {
 
-class {'openstack::clientlib':
+class {'::openstack::clientlib':
 version => $version
 }
+contain '::openstack::clientlib'
 
-class {'openstack::common':}
+class {'::openstack::common':}
+contain '::openstack::common'
 }
diff --git a/modules/profile/manifests/openstack/base/cloudrepo.pp 
b/modules/profile/manifests/openstack/base/cloudrepo.pp
index 5fbe658..1f1904e 100644
--- a/modules/profile/manifests/openstack/base/cloudrepo.pp
+++ b/modules/profile/manifests/openstack/base/cloudrepo.pp
@@ -4,4 +4,5 @@
 class { '::openstack::cloudrepo':
 version => $version,
 }
+contain '::openstack::cloudrepo'
 }
diff --git a/modules/profile/manifests/openstack/base/designate/service.pp 
b/modules/profile/manifests/openstack/base/designate/service.pp
index b6169c0..c0bc23b 100644
--- a/modules/profile/manifests/openstack/base/designate/service.pp
+++ b/modules/profile/manifests/openstack/base/designate/service.pp
@@ -57,6 +57,7 @@
 keystone_public_port   => $keystone_public_port,
 keystone_auth_port => $keystone_auth_port,
 }
+contain '::openstack::designate::service'
 
 # Open designate API to Labs web UIs and the commandline on labcontrol
 ferm::rule { 'designate-api':
diff --git a/modules/profile/manifests/openstack/base/glance.pp 
b/modules/profile/manifests/openstack/base/glance.pp
index c98d27b..90835b0 100644
--- a/modules/profile/manifests/openstack/base/glance.pp
+++ b/modules/profile/manifests/openstack/base/glance.pp
@@ -17,7 +17,7 @@
 $keystone_admin_uri = "http://${nova_controller}:${auth_port}";
 $keystone_public_uri = "http://${nova_controller}:${public_port}";
 
-class { 'openstack::glance::service':
+class { '::openstack::glance::service':
 version => $version,
 active  => $::fqdn == $nova_controller,
 keystone_admin_uri  => $keystone_admin_uri,
@@ -31,6 +31,7 @@
 glance_data => $glance_data,
 glance_image_dir=> $glance_image_dir,
 }
+contain '::openstack::glance::service'
 
 include ::network::constants
 $prod_networks = join($network::constants::production_networks, ' ')
diff --git a/modules/profile/manifests/openstack/base/horizon/dashboard.pp 
b/modules/profile/manifests/openstack/base/horizon/dashboard.pp
index 0f12da3..82fdd76 100644
--- a/modules/profile/manifests/openstack/base/horizon/dashboard.pp
+++ b/modules/profile/manifests/openstack/base/horizon/dashboard.pp
@@ -9,7 +9,7 @@
 ) {
 
 # TODO: Add openstack::util::envscripts during profile conversion
-class { 'openstack::horizon::service':
+class { '::openstack::horizon::service':
 version => $version,
 nova_controller => $nova_controller,
 wmflabsdotorg_admin => $wmflabsdotorg_admin,
@@ -18,11 +18,13 @@
 ldap_user_pass  => $ldap_user_pass,
 webserver_hostname  => $webserver_hostname,
 }
+contain '::openstack::horizon::service'
 
 #   require => Class['openstack::horizon::service'],
 class {'::openstack::horizon::puppetpanel':