Rush has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/398169 )
Change subject: openstack: sane class dependency handling for labtest[n]
......................................................................
openstack: sane class dependency handling for labtest[n]
Bug: T171494
Change-Id: I6f235999ff42c91637d845c2c1a457e59ab6099f
---
M modules/profile/manifests/openstack/base/nova/api/service.pp
M modules/profile/manifests/openstack/base/nova/compute/service.pp
M modules/profile/manifests/openstack/base/nova/conductor/service.pp
M modules/profile/manifests/openstack/base/nova/fullstack/service.pp
M modules/profile/manifests/openstack/base/nova/network/service.pp
M modules/profile/manifests/openstack/base/nova/scheduler/service.pp
M modules/profile/manifests/openstack/base/nova/spiceproxy/service.pp
M modules/profile/manifests/openstack/labtest/clientlib.pp
M modules/profile/manifests/openstack/labtest/cloudrepo.pp
M modules/profile/manifests/openstack/labtest/designate/service.pp
M modules/profile/manifests/openstack/labtest/glance.pp
M modules/profile/manifests/openstack/labtest/horizon/dashboard.pp
M modules/profile/manifests/openstack/labtest/keystone/service.pp
M modules/profile/manifests/openstack/labtest/nova/api/service.pp
M modules/profile/manifests/openstack/labtest/nova/common.pp
M modules/profile/manifests/openstack/labtest/nova/compute/service.pp
M modules/profile/manifests/openstack/labtest/nova/conductor/service.pp
M modules/profile/manifests/openstack/labtest/nova/network/service.pp
M modules/profile/manifests/openstack/labtest/nova/scheduler/service.pp
M modules/profile/manifests/openstack/labtest/nova/spiceproxy/service.pp
M modules/profile/manifests/openstack/labtest/observerenv.pp
M modules/profile/manifests/openstack/labtest/pdns/dns_floating_ip_updater.pp
M modules/profile/manifests/openstack/labtest/rabbitmq.pp
M modules/profile/manifests/openstack/labtestn/clientlib.pp
24 files changed, 33 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/69/398169/1
diff --git a/modules/profile/manifests/openstack/base/nova/api/service.pp
b/modules/profile/manifests/openstack/base/nova/api/service.pp
index f1b5993..35a40f2 100644
--- a/modules/profile/manifests/openstack/base/nova/api/service.pp
+++ b/modules/profile/manifests/openstack/base/nova/api/service.pp
@@ -5,8 +5,10 @@
class {'::openstack::nova::api::service':
active => ($::fqdn == $nova_api_host),
}
+ contain '::openstack::nova::api::service'
class {'::openstack::nova::api::monitor':
active => ($::fqdn == $nova_api_host),
}
+ contain '::openstack::nova::api::monitor'
}
diff --git a/modules/profile/manifests/openstack/base/nova/compute/service.pp
b/modules/profile/manifests/openstack/base/nova/compute/service.pp
index 1764deb..27fc19a 100644
--- a/modules/profile/manifests/openstack/base/nova/compute/service.pp
+++ b/modules/profile/manifests/openstack/base/nova/compute/service.pp
@@ -56,4 +56,5 @@
certname => $certname,
ca_target => $ca_target,
}
+ contain '::openstack::nova::compute::service'
}
diff --git a/modules/profile/manifests/openstack/base/nova/conductor/service.pp
b/modules/profile/manifests/openstack/base/nova/conductor/service.pp
index a6eeeb0..a0462ff 100644
--- a/modules/profile/manifests/openstack/base/nova/conductor/service.pp
+++ b/modules/profile/manifests/openstack/base/nova/conductor/service.pp
@@ -5,4 +5,5 @@
class {'::openstack::nova::conductor::service':
active => $::fqdn == $nova_controller,
}
+ contain '::openstack::nova::conductor::service'
}
diff --git a/modules/profile/manifests/openstack/base/nova/fullstack/service.pp
b/modules/profile/manifests/openstack/base/nova/fullstack/service.pp
index ca83640..dbb95e1 100644
--- a/modules/profile/manifests/openstack/base/nova/fullstack/service.pp
+++ b/modules/profile/manifests/openstack/base/nova/fullstack/service.pp
@@ -7,4 +7,5 @@
active => ($::fqdn == $nova_api_host),
password => $osstackcanary_pass,
}
+ contain '::openstack::nova::fullstack::service'
}
diff --git a/modules/profile/manifests/openstack/base/nova/network/service.pp
b/modules/profile/manifests/openstack/base/nova/network/service.pp
index 355f1d0..f952115 100644
--- a/modules/profile/manifests/openstack/base/nova/network/service.pp
+++ b/modules/profile/manifests/openstack/base/nova/network/service.pp
@@ -34,4 +34,5 @@
dns_recursor => $dns_recursor,
dns_recursor_secondary => $dns_recursor_secondary,
}
+ contain '::openstack::nova::network::service'
}
diff --git a/modules/profile/manifests/openstack/base/nova/scheduler/service.pp
b/modules/profile/manifests/openstack/base/nova/scheduler/service.pp
index d6ad90d..61da5d8 100644
--- a/modules/profile/manifests/openstack/base/nova/scheduler/service.pp
+++ b/modules/profile/manifests/openstack/base/nova/scheduler/service.pp
@@ -7,4 +7,5 @@
active => ($::fqdn == $nova_controller),
version => $version,
}
+ contain '::openstack::nova::scheduler::service'
}
diff --git
a/modules/profile/manifests/openstack/base/nova/spiceproxy/service.pp
b/modules/profile/manifests/openstack/base/nova/spiceproxy/service.pp
index 7ca6f07..c10cba2 100644
--- a/modules/profile/manifests/openstack/base/nova/spiceproxy/service.pp
+++ b/modules/profile/manifests/openstack/base/nova/spiceproxy/service.pp
@@ -7,6 +7,7 @@
active => ($::fqdn == $nova_controller),
version => $version,
}
+ contain '::openstack::nova::spiceproxy::service'
ferm::rule{'spice_consoles':
ensure => 'present',
diff --git a/modules/profile/manifests/openstack/labtest/clientlib.pp
b/modules/profile/manifests/openstack/labtest/clientlib.pp
index 87bfb1a..78cae6d 100644
--- a/modules/profile/manifests/openstack/labtest/clientlib.pp
+++ b/modules/profile/manifests/openstack/labtest/clientlib.pp
@@ -6,4 +6,5 @@
class {'::profile::openstack::base::clientlib':
version => $version
}
+ contain '::profile::openstack::base::clientlib'
}
diff --git a/modules/profile/manifests/openstack/labtest/cloudrepo.pp
b/modules/profile/manifests/openstack/labtest/cloudrepo.pp
index fe72764..195c1eb 100644
--- a/modules/profile/manifests/openstack/labtest/cloudrepo.pp
+++ b/modules/profile/manifests/openstack/labtest/cloudrepo.pp
@@ -4,4 +4,5 @@
class { '::profile::openstack::base::cloudrepo':
version => $version
}
+ contain '::profile::openstack::base::cloudrepo'
}
diff --git a/modules/profile/manifests/openstack/labtest/designate/service.pp
b/modules/profile/manifests/openstack/labtest/designate/service.pp
index 4609348..8c4e5b4 100644
--- a/modules/profile/manifests/openstack/labtest/designate/service.pp
+++ b/modules/profile/manifests/openstack/labtest/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/labtest/glance.pp
b/modules/profile/manifests/openstack/labtest/glance.pp
index 11f15b7..94607cf 100644
--- a/modules/profile/manifests/openstack/labtest/glance.pp
+++ b/modules/profile/manifests/openstack/labtest/glance.pp
@@ -18,8 +18,10 @@
ldap_user_pass => $ldap_user_pass,
labs_hosts_range => $labs_hosts_range,
}
+ contain '::profile::openstack::base::glance'
- class {'openstack::glance::monitor':
+ class {'::openstack::glance::monitor':
active => ($::fqdn == $nova_controller),
}
+ contain '::openstack::glance::monitor'
}
diff --git a/modules/profile/manifests/openstack/labtest/horizon/dashboard.pp
b/modules/profile/manifests/openstack/labtest/horizon/dashboard.pp
index a98f0c5..32f4e18 100644
--- a/modules/profile/manifests/openstack/labtest/horizon/dashboard.pp
+++ b/modules/profile/manifests/openstack/labtest/horizon/dashboard.pp
@@ -18,4 +18,5 @@
ldap_user_pass => $ldap_user_pass,
webserver_hostname => $webserver_hostname,
}
+ contain '::profile::openstack::base::horizon::dashboard'
}
diff --git a/modules/profile/manifests/openstack/labtest/keystone/service.pp
b/modules/profile/manifests/openstack/labtest/keystone/service.pp
index de51b91..275eac2 100644
--- a/modules/profile/manifests/openstack/labtest/keystone/service.pp
+++ b/modules/profile/manifests/openstack/labtest/keystone/service.pp
@@ -35,6 +35,7 @@
horizon_host => $horizon_host,
osm_host => $osm_host,
}
+ contain '::profile::openstack::base::keystone::db'
require ::profile::openstack::labtest::clientlib
class {'::profile::openstack::base::keystone::service':
@@ -66,8 +67,11 @@
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/labtest/nova/api/service.pp
b/modules/profile/manifests/openstack/labtest/nova/api/service.pp
index 3a1e0b2..cbb2d53 100644
--- a/modules/profile/manifests/openstack/labtest/nova/api/service.pp
+++ b/modules/profile/manifests/openstack/labtest/nova/api/service.pp
@@ -6,4 +6,5 @@
class {'::profile::openstack::base::nova::api::service':
nova_api_host => $nova_api_host,
}
+ contain '::profile::openstack::base::nova::api::service'
}
diff --git a/modules/profile/manifests/openstack/labtest/nova/common.pp
b/modules/profile/manifests/openstack/labtest/nova/common.pp
index 73e687a..5595c86 100644
--- a/modules/profile/manifests/openstack/labtest/nova/common.pp
+++ b/modules/profile/manifests/openstack/labtest/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/labtest/nova/compute/service.pp
b/modules/profile/manifests/openstack/labtest/nova/compute/service.pp
index d47ba66..1289f54 100644
--- a/modules/profile/manifests/openstack/labtest/nova/compute/service.pp
+++ b/modules/profile/manifests/openstack/labtest/nova/compute/service.pp
@@ -17,9 +17,11 @@
network_flat_tagged_base_interface =>
$network_flat_tagged_base_interface,
network_flat_interface_vlan => $network_flat_interface_vlan,
}
+ contain '::profile::openstack::base::nova::compute::service'
class {'::openstack::nova::compute::monitor':
active => true,
certname => $certname,
}
+ contain '::openstack::nova::compute::monitor'
}
diff --git
a/modules/profile/manifests/openstack/labtest/nova/conductor/service.pp
b/modules/profile/manifests/openstack/labtest/nova/conductor/service.pp
index 3f07a9b..803b398 100644
--- a/modules/profile/manifests/openstack/labtest/nova/conductor/service.pp
+++ b/modules/profile/manifests/openstack/labtest/nova/conductor/service.pp
@@ -6,4 +6,5 @@
class {'::profile::openstack::base::nova::conductor::service':
nova_controller => $nova_controller,
}
+ contain '::profile::openstack::base::nova::conductor::service'
}
diff --git
a/modules/profile/manifests/openstack/labtest/nova/network/service.pp
b/modules/profile/manifests/openstack/labtest/nova/network/service.pp
index 07d051d..3ae99bc 100644
--- a/modules/profile/manifests/openstack/labtest/nova/network/service.pp
+++ b/modules/profile/manifests/openstack/labtest/nova/network/service.pp
@@ -20,8 +20,10 @@
network_flat_interface_vlan => $network_flat_interface_vlan,
network_public_ip => $network_public_ip,
}
+ contain '::profile::openstack::base::nova::network::service'
class {'::openstack::nova::network::monitor':
active => ($::fqdn == $nova_network_host),
}
+ contain '::openstack::nova::network::monitor'
}
diff --git
a/modules/profile/manifests/openstack/labtest/nova/scheduler/service.pp
b/modules/profile/manifests/openstack/labtest/nova/scheduler/service.pp
index 8172f75..aa897a0 100644
--- a/modules/profile/manifests/openstack/labtest/nova/scheduler/service.pp
+++ b/modules/profile/manifests/openstack/labtest/nova/scheduler/service.pp
@@ -8,8 +8,10 @@
version => $version,
nova_controller => $nova_controller,
}
+ contain '::profile::openstack::base::nova::scheduler::service'
class {'::openstack::nova::scheduler::monitor':
active => ($::fqdn == $nova_controller),
}
+ contain '::openstack::nova::scheduler::monitor'
}
diff --git
a/modules/profile/manifests/openstack/labtest/nova/spiceproxy/service.pp
b/modules/profile/manifests/openstack/labtest/nova/spiceproxy/service.pp
index 18c21a3..84ce4a9 100644
--- a/modules/profile/manifests/openstack/labtest/nova/spiceproxy/service.pp
+++ b/modules/profile/manifests/openstack/labtest/nova/spiceproxy/service.pp
@@ -8,4 +8,5 @@
version => $version,
nova_controller => $nova_controller,
}
+ contain '::profile::openstack::base::nova::spiceproxy::service'
}
diff --git a/modules/profile/manifests/openstack/labtest/observerenv.pp
b/modules/profile/manifests/openstack/labtest/observerenv.pp
index 3e72d19..0f4d13d 100644
--- a/modules/profile/manifests/openstack/labtest/observerenv.pp
+++ b/modules/profile/manifests/openstack/labtest/observerenv.pp
@@ -7,4 +7,5 @@
nova_controller => $nova_controller ,
observer_password => $observer_password,
}
+ contain '::profile::openstack::base::observerenv'
}
diff --git
a/modules/profile/manifests/openstack/labtest/pdns/dns_floating_ip_updater.pp
b/modules/profile/manifests/openstack/labtest/pdns/dns_floating_ip_updater.pp
index 8fff6f4..2c7150a 100644
---
a/modules/profile/manifests/openstack/labtest/pdns/dns_floating_ip_updater.pp
+++
b/modules/profile/manifests/openstack/labtest/pdns/dns_floating_ip_updater.pp
@@ -13,4 +13,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 '::profile::openstack::base::pdns::dns_floating_ip_updater'
}
diff --git a/modules/profile/manifests/openstack/labtest/rabbitmq.pp
b/modules/profile/manifests/openstack/labtest/rabbitmq.pp
index 4bbb317..fee9bc1 100644
--- a/modules/profile/manifests/openstack/labtest/rabbitmq.pp
+++ b/modules/profile/manifests/openstack/labtest/rabbitmq.pp
@@ -18,4 +18,5 @@
nova_api_host => $nova_api_host,
designate_host => $designate_host,
}
+ contain '::profile::openstack::base::rabbitmq'
}
diff --git a/modules/profile/manifests/openstack/labtestn/clientlib.pp
b/modules/profile/manifests/openstack/labtestn/clientlib.pp
index 3b5f0be..a9d4069 100644
--- a/modules/profile/manifests/openstack/labtestn/clientlib.pp
+++ b/modules/profile/manifests/openstack/labtestn/clientlib.pp
@@ -6,5 +6,5 @@
class {'profile::openstack::base::clientlib':
version => $version
}
- contain 'profile::openstack::base::clientlib'
+ contain '::profile::openstack::base::clientlib'
}
--
To view, visit https://gerrit.wikimedia.org/r/398169
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f235999ff42c91637d845c2c1a457e59ab6099f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <r...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
