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':
version => $version,
}
+ contain '::openstack::horizon::puppetpanel'
ferm::service { 'horizon_http':
proto => 'tcp',
diff --git a/modules/profile/manifests/openstack/base/keystone/hooks.pp
b/modules/profile/manifests/openstack/base/keystone/hooks.pp
index b8f56ac..6bb36c9 100644
--- a/modules/profile/manifests/openstack/base/keystone/hooks.pp
+++ b/modules/profile/manifests/openstack/base/keystone/hooks.pp
@@ -2,7 +2,8 @@
$version = hiera('profile::openstack::base::version'),
) {
- class { 'openstack::keystone::hooks':
+ class { '::openstack::keystone::hooks':
version => $version,
}
+ contain '::openstack::keystone::hooks'
}
diff --git a/modules/profile/manifests/openstack/base/keystone/service.pp
b/modules/profile/manifests/openstack/base/keystone/service.pp
index 4a34b67..84bc3db 100644
--- a/modules/profile/manifests/openstack/base/keystone/service.pp
+++ b/modules/profile/manifests/openstack/base/keystone/service.pp
@@ -70,12 +70,14 @@
wiki_access_token => $wiki_access_token,
wiki_access_secret => $wiki_access_secret,
}
+ contain '::openstack::keystone::service'
class {'::openstack::keystone::monitor':
active => $::fqdn == $nova_controller,
auth_port => $auth_port,
public_port => $public_port,
}
+ contain '::openstack::keystone::monitor'
class {'::openstack::util::envscripts':
ldap_user_pass => $ldap_user_pass,
@@ -86,10 +88,12 @@
wmflabsdotorg_pass => $wmflabsdotorg_pass,
wmflabsdotorg_project => $wmflabsdotorg_project,
}
+ contain '::openstack::util::envscripts'
class {'::openstack::util::admin_scripts':
version => $version,
}
+ contain '::openstack::util::admin_scripts'
# keystone admin API only for openstack services that might need it
ferm::rule{'keystone_admin':
diff --git a/modules/profile/manifests/openstack/base/nodepool/service.pp
b/modules/profile/manifests/openstack/base/nodepool/service.pp
index b86ae52..0be7d58 100644
--- a/modules/profile/manifests/openstack/base/nodepool/service.pp
+++ b/modules/profile/manifests/openstack/base/nodepool/service.pp
@@ -34,4 +34,5 @@
openstack_password => $passwords::nodepool::manager_pass,
openstack_tenant_id => 'contintcloud',
}
+ contain '::nodepool'
}
diff --git a/modules/profile/manifests/openstack/base/nova/common.pp
b/modules/profile/manifests/openstack/base/nova/common.pp
index 26c6148..dfc76de 100644
--- a/modules/profile/manifests/openstack/base/nova/common.pp
+++ b/modules/profile/manifests/openstack/base/nova/common.pp
@@ -62,4 +62,5 @@
keystone_auth_uri => $keystone_auth_uri,
keystone_admin_uri => $keystone_admin_uri,
}
+ contain '::openstack::nova::common'
}
diff --git
a/modules/profile/manifests/openstack/base/pdns/dns_floating_ip_updater.pp
b/modules/profile/manifests/openstack/base/pdns/dns_floating_ip_updater.pp
index 69e03d5..7f1556b 100644
--- a/modules/profile/manifests/openstack/base/pdns/dns_floating_ip_updater.pp
+++ b/modules/profile/manifests/openstack/base/pdns/dns_floating_ip_updater.pp
@@ -17,4 +17,5 @@
floating_ip_ptr_fqdn_matching_regex =>
$floating_ip_ptr_fqdn_matching_regex,
floating_ip_ptr_fqdn_replacement_pattern =>
$floating_ip_ptr_fqdn_replacement_pattern,
}
+ contain '::openstack::designate::dns_floating_ip_updater'
}
diff --git a/modules/profile/manifests/openstack/base/rabbitmq.pp
b/modules/profile/manifests/openstack/base/rabbitmq.pp
index b319485..b8fbb53 100644
--- a/modules/profile/manifests/openstack/base/rabbitmq.pp
+++ b/modules/profile/manifests/openstack/base/rabbitmq.pp
@@ -12,11 +12,13 @@
running => $::fqdn == $nova_controller,
file_handles => $file_handles,
}
+ contain '::rabbitmq'
class { '::rabbitmq::monitor':
rabbit_monitor_username => $monitor_user,
rabbit_monitor_password => $monitor_password,
}
+ contain '::rabbitmq::monitor'
ferm::rule{'rabbit_for_designate':
ensure => 'present',
diff --git a/modules/profile/manifests/openstack/labtestn/designate/service.pp
b/modules/profile/manifests/openstack/labtestn/designate/service.pp
index b7b95ab..b26bec1 100644
--- a/modules/profile/manifests/openstack/labtestn/designate/service.pp
+++ b/modules/profile/manifests/openstack/labtestn/designate/service.pp
@@ -36,4 +36,5 @@
osm_host => $osm_host,
horizon_host => $horizon_host,
}
+ contain '::profile::openstack::base::designate::service'
}
diff --git a/modules/profile/manifests/openstack/labtestn/glance.pp
b/modules/profile/manifests/openstack/labtestn/glance.pp
index 0503f7a..e08530a 100644
--- a/modules/profile/manifests/openstack/labtestn/glance.pp
+++ b/modules/profile/manifests/openstack/labtestn/glance.pp
@@ -18,4 +18,5 @@
ldap_user_pass => $ldap_user_pass,
labs_hosts_range => $labs_hosts_range,
}
+ contain '::profile::openstack::base::glance'
}
diff --git a/modules/profile/manifests/openstack/labtestn/keystone/service.pp
b/modules/profile/manifests/openstack/labtestn/keystone/service.pp
index f968ded..1a42f31 100644
--- a/modules/profile/manifests/openstack/labtestn/keystone/service.pp
+++ b/modules/profile/manifests/openstack/labtestn/keystone/service.pp
@@ -35,6 +35,7 @@
horizon_host => $horizon_host,
osm_host => $osm_host,
}
+ contain '::profile::openstack::base::keystone::db'
require ::profile::openstack::labtestn::clientlib
class {'::profile::openstack::base::keystone::service':
@@ -66,8 +67,10 @@
horizon_host => $horizon_host,
require =>
Class['profile::openstack::base::keystone::db'],
}
+ contain '::profile::openstack::base::keystone::service'
class {'::profile::openstack::base::keystone::hooks':
version => $version,
}
+ contain '::profile::openstack::base::keystone::hooks'
}
diff --git a/modules/profile/manifests/openstack/labtestn/nova/common.pp
b/modules/profile/manifests/openstack/labtestn/nova/common.pp
index 29625aa..49b878d 100644
--- a/modules/profile/manifests/openstack/labtestn/nova/common.pp
+++ b/modules/profile/manifests/openstack/labtestn/nova/common.pp
@@ -44,4 +44,5 @@
rabbit_pass => $rabbit_pass,
spice_hostname => $spice_hostname,
}
+ contain '::profile::openstack::base::nova::common'
}
diff --git a/modules/profile/manifests/openstack/labtestn/rabbitmq.pp
b/modules/profile/manifests/openstack/labtestn/rabbitmq.pp
index 59070fb..c12122a 100644
--- a/modules/profile/manifests/openstack/labtestn/rabbitmq.pp
+++ b/modules/profile/manifests/openstack/labtestn/rabbitmq.pp
@@ -18,4 +18,5 @@
nova_api_host => $nova_api_host,
designate_host => $designate_host,
}
+ contain '::profile::openstack::base::rabbitmq'
}
--
To view, visit https://gerrit.wikimedia.org/r/397903
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6db063a930517dbc5059dad781488025782cc89e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
