Rush has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/368332 )
Change subject: Revert "openstack: move openstack::repo to new model"
......................................................................
Revert "openstack: move openstack::repo to new model"
This reverts commit 9411cf80dcd43efd4e40a15e6da3a70de2238054.
Change-Id: I56be86825582ff578b161a2a394a3a5a6df7411c
---
M hieradata/common.yaml
M hieradata/hosts/californium.yaml
M hieradata/hosts/labstore1004.yaml
M hieradata/hosts/labstore1005.yaml
M hieradata/hosts/labtestweb2001.yaml
M hieradata/role/common/labs/nfs/primary.yaml
M hieradata/role/common/labs/nfs/secondary.yaml
M manifests/site.pp
M modules/openstack/manifests/ceilometer/compute.pp
M modules/openstack/manifests/ceilometer/controller.pp
M modules/openstack/manifests/clientlib.pp
M modules/openstack/manifests/common.pp
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/service.pp
M modules/openstack/manifests/nova/api.pp
M modules/openstack/manifests/nova/compute.pp
M modules/openstack/manifests/nova/conductor.pp
M modules/openstack/manifests/nova/network.pp
M modules/openstack/manifests/nova/scheduler.pp
M modules/openstack/manifests/nova/spiceproxy.pp
M modules/openstack/manifests/queue_server.pp
D modules/openstack2/manifests/cloudrepo.pp
D modules/profile/manifests/openstack/base/cloudrepo.pp
D modules/profile/manifests/openstack/labtest/cloudrepo.pp
D modules/profile/manifests/openstack/labtestn/cloudrepo.pp
D modules/profile/manifests/openstack/main/cloudrepo.pp
A modules/role/manifests/wmcloud/openstack/control.pp
D modules/role/manifests/wmcs/openstack/labtest/control.pp
D modules/role/manifests/wmcs/openstack/labtest/net.pp
D modules/role/manifests/wmcs/openstack/labtest/services.pp
D modules/role/manifests/wmcs/openstack/labtest/virt.pp
D modules/role/manifests/wmcs/openstack/labtest/web.pp
D modules/role/manifests/wmcs/openstack/labtestn/control.pp
D modules/role/manifests/wmcs/openstack/labtestn/net.pp
D modules/role/manifests/wmcs/openstack/labtestn/services.pp
D modules/role/manifests/wmcs/openstack/labtestn/virt.pp
D modules/role/manifests/wmcs/openstack/labtestn/web.pp
D modules/role/manifests/wmcs/openstack/main/control.pp
D modules/role/manifests/wmcs/openstack/main/horizon.pp
D modules/role/manifests/wmcs/openstack/main/net.pp
D modules/role/manifests/wmcs/openstack/main/net_secondary.pp
D modules/role/manifests/wmcs/openstack/main/services.pp
D modules/role/manifests/wmcs/openstack/main/virt.pp
D modules/role/manifests/wmcs/openstack/main/web.pp
D modules/role/manifests/wmcs/openstack/main/wikitech.pp
47 files changed, 57 insertions(+), 191 deletions(-)
Approvals:
Rush: Verified; Looks good to me, approved
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 98ef81f..e45ce54 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -319,10 +319,6 @@
# LABS
-profile::openstack::main::version: 'liberty'
-profile::openstack::labtest::version: 'liberty'
-profile::openstack::labtestn::version: 'liberty'
-
labs_tld: "wmflabs"
labs_private_ips_reverse_dns: "68.10.in-addr.arpa"
labs_designate_hostname: &labsdesignatehostname "labservices1001.wikimedia.org"
diff --git a/hieradata/hosts/californium.yaml b/hieradata/hosts/californium.yaml
index 467d0ed..2c0c74d 100644
--- a/hieradata/hosts/californium.yaml
+++ b/hieradata/hosts/californium.yaml
@@ -1,2 +1 @@
-profile::openstack::main::version: 'mitaka'
openstack::version: 'mitaka'
diff --git a/hieradata/hosts/labstore1004.yaml
b/hieradata/hosts/labstore1004.yaml
index e81a0b5..6bcecbc 100644
--- a/hieradata/hosts/labstore1004.yaml
+++ b/hieradata/hosts/labstore1004.yaml
@@ -1,2 +1 @@
-profile::openstack::main::version: 'mitaka'
openstack::version: mitaka
diff --git a/hieradata/hosts/labstore1005.yaml
b/hieradata/hosts/labstore1005.yaml
index e81a0b5..6bcecbc 100644
--- a/hieradata/hosts/labstore1005.yaml
+++ b/hieradata/hosts/labstore1005.yaml
@@ -1,2 +1 @@
-profile::openstack::main::version: 'mitaka'
openstack::version: mitaka
diff --git a/hieradata/hosts/labtestweb2001.yaml
b/hieradata/hosts/labtestweb2001.yaml
index 2d42e1a..0f588af 100644
--- a/hieradata/hosts/labtestweb2001.yaml
+++ b/hieradata/hosts/labtestweb2001.yaml
@@ -3,6 +3,5 @@
apache::logrotate::rotate: 12
-profile::openstack::main::version: 'mitaka'
openstack::version: mitaka
profile::backup::host::enable: false
diff --git a/hieradata/role/common/labs/nfs/primary.yaml
b/hieradata/role/common/labs/nfs/primary.yaml
index 49afc31..628bdfa 100644
--- a/hieradata/role/common/labs/nfs/primary.yaml
+++ b/hieradata/role/common/labs/nfs/primary.yaml
@@ -14,7 +14,6 @@
debdeploy-labsnfs:
value: standard
-profile::openstack::main::version: 'mitaka'
openstack::version: mitaka
admin::groups:
diff --git a/hieradata/role/common/labs/nfs/secondary.yaml
b/hieradata/role/common/labs/nfs/secondary.yaml
index 49afc31..628bdfa 100644
--- a/hieradata/role/common/labs/nfs/secondary.yaml
+++ b/hieradata/role/common/labs/nfs/secondary.yaml
@@ -14,7 +14,6 @@
debdeploy-labsnfs:
value: standard
-profile::openstack::main::version: 'mitaka'
openstack::version: mitaka
admin::groups:
diff --git a/manifests/site.pp b/manifests/site.pp
index 4a92fd5..ee9bec3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -199,10 +199,7 @@
# and Tool Labs admin console AKA Striker
# It's proxied by the misc-web varnishes
node 'californium.wikimedia.org' {
- role(wmcs::openstack::main::horizon,
- horizon,
- striker::web,
- labs::instance_info_dumper)
+ role(horizon, striker::web, labs::instance_info_dumper)
include ::standard
include ::base::firewall
include ::openstack::horizon::puppetpanel
@@ -1005,50 +1002,38 @@
# labservices1001 hosts openstack-designate, the labs DNS service.
node 'labservices1001.wikimedia.org' {
- role(wmcs::openstack::main::services,
- labs::dns,
- labs::openstack::designate::server,
- labs::dnsrecursor,
- labs::dns_floating_ip_updater)
+ role(labs::dns, labs::openstack::designate::server, labs::dnsrecursor,
+ labs::dns_floating_ip_updater)
include ::standard
include ::base::firewall
include ::ldap::role::client::labs
}
node 'labservices1002.wikimedia.org' {
- role(wmcs::openstack::main::services,
- labs::dns,
- labs::openstack::designate::server,
- labs::dnsrecursor)
+ role(labs::dns, labs::openstack::designate::server, labs::dnsrecursor)
include ::standard
include ::base::firewall
include ::ldap::role::client::labs
}
node 'labtestneutron2001.codfw.wmnet' {
- role(wmcs::openstack::labtestn::net)
include ::standard
}
node /^labtestvirt200[1-3]\.codfw\.wmnet$/ {
- role(wmcs::openstack::labtest::virt,
- labs::openstack::nova::compute)
+ role(labs::openstack::nova::compute)
include ::standard
}
node 'labtestnet2001.codfw.wmnet' {
- role(wmcs::openstack::labtest::net,
- labs::openstack::nova::api,
- labs::openstack::nova::network)
+ role(labs::openstack::nova::api, labs::openstack::nova::network)
include ::standard
}
node 'labtestcontrol2001.wikimedia.org' {
include ::standard
include ::base::firewall
- role(wmcs::openstack::labtest::control,
- labs::openstack::nova::controller,
- labs::puppetmaster)
+ role(labs::openstack::nova::controller, labs::puppetmaster)
# Labtest is weird; the mysql server is on labtestcontrol2001. So
# we need some special fw rules to allow that
@@ -1078,7 +1063,6 @@
}
node 'labtestcontrol2003.wikimedia.org' {
- role(wmcs::openstack::labtestn::control)
include ::base::firewall
include ::standard
}
@@ -1090,26 +1074,20 @@
}
node 'labtestservices2001.wikimedia.org' {
- role(wmcs::openstack::labtest::services,
- labs::dns,
- labs::openstack::designate::server,
- labs::dnsrecursor,
- openldap::labtest,
- labs::dns_floating_ip_updater)
+ role(labs::dns, labs::openstack::designate::server, labs::dnsrecursor,
openldap::labtest,
+ labs::dns_floating_ip_updater)
include ::standard
include ::base::firewall
interface::add_ip6_mapped { 'main': }
}
node /labtestservices200[23]\.wikimedia\.org/ {
- role(wmcs::openstack::labtestn::services)
include ::base::firewall
include ::standard
interface::add_ip6_mapped { 'main': }
}
node /labweb100[12]\.wikimedia\.org/ {
- role(wmcs::openstack::main::web)
include ::base::firewall
include ::standard
interface::add_ip6_mapped { 'main': }
@@ -1235,8 +1213,7 @@
}
node 'labcontrol1001.wikimedia.org' {
- role(wmcs::openstack::main::control,
- labs::openstack::nova::controller,
+ role(labs::openstack::nova::controller,
labs::puppetmaster,
salt::masters::labs,
deployment::salt_masters)
@@ -1252,8 +1229,7 @@
# basically repeated use of 'keystone endpoint-list,'
# 'keystone endpoint-create' and 'keystone endpoint-delete.'
node 'labcontrol1002.wikimedia.org' {
- role(wmcs::openstack::main::control,
- labs::openstack::nova::controller,
+ role(labs::openstack::nova::controller,
labs::puppetmaster,
salt::masters::labs,
deployment::salt_masters)
@@ -1267,10 +1243,7 @@
# - silver (wikitech.wikimedia.org), and
# - californium (horizon.wikimedia.org)
node 'labtestweb2001.wikimedia.org' {
- role(wmcs::openstack::labtest::web,
- labs::openstack::nova::manager,
- mariadb::wikitech,
- horizon)
+ role(labs::openstack::nova::manager, mariadb::wikitech, horizon)
include ::base::firewall
include ::standard
include ::openstack::horizon::puppetpanel
@@ -1287,10 +1260,9 @@
}
node 'labnet1001.eqiad.wmnet' {
- role(wmcs::openstack::main::net,
- labs::openstack::nova::api,
- labs::openstack::nova::network,
- labs::openstack::nova::fullstack)
+ role(labs::openstack::nova::api,
+ labs::openstack::nova::network,
+ labs::openstack::nova::fullstack)
include ::standard
}
@@ -1301,8 +1273,7 @@
node 'labnet1002.eqiad.wmnet' {
- role(wmcs::openstack::main::net_secondary,
- labs::openstack::nova::api)
+ role(labs::openstack::nova::api)
include ::standard
}
@@ -2099,9 +2070,7 @@
# Silver is the new home of the wikitech web server.
node 'silver.wikimedia.org' {
- role(wmcs::openstack::main::wikitech,
- labs::openstack::nova::manager,
- mariadb::wikitech)
+ role(labs::openstack::nova::manager, mariadb::wikitech)
include ::base::firewall
include ::standard
@@ -2296,8 +2265,7 @@
node /^labvirt100[0-9].eqiad.wmnet/ {
openstack::nova::partition{ '/dev/sdb': }
- role(wmcs::openstack::main::virt,
- labs::openstack::nova::compute)
+ role(labs::openstack::nova::compute)
include ::standard
}
@@ -2308,8 +2276,7 @@
# and also as potential transitional hosts
# during the upcoming neutron migration.
node /^labvirt101[0-8].eqiad.wmnet/ {
- role(wmcs::openstack::main::virt,
- labs::openstack::nova::compute)
+ role(labs::openstack::nova::compute)
include ::standard
}
diff --git a/modules/openstack/manifests/ceilometer/compute.pp
b/modules/openstack/manifests/ceilometer/compute.pp
index 20ecfdb..e46d337 100644
--- a/modules/openstack/manifests/ceilometer/compute.pp
+++ b/modules/openstack/manifests/ceilometer/compute.pp
@@ -2,8 +2,11 @@
# https://wiki.openstack.org/wiki/Ceilometer
class openstack::ceilometer::compute ($novaconfig,
$openstack_version=$::openstack::version) {
+ include ::openstack::repo
+
package { [ceilometer-agent-compute]:
ensure => present,
+ require => Class['openstack::repo'];
}
service {'ceilometer-agent-compute':
diff --git a/modules/openstack/manifests/ceilometer/controller.pp
b/modules/openstack/manifests/ceilometer/controller.pp
index de68201..7a1c3c0 100644
--- a/modules/openstack/manifests/ceilometer/controller.pp
+++ b/modules/openstack/manifests/ceilometer/controller.pp
@@ -2,8 +2,11 @@
# https://wiki.openstack.org/wiki/Ceilometer
class openstack::ceilometer::controller ($novaconfig,
$openstack_version=$::openstack::version) {
+ include ::openstack::repo
+
package { [ceilometer-api, ceilometer-collector, ceilometer-agent-central,
python-ceilometerclient]:
ensure => present,
+ require => Class['openstack::repo'];
}
service {'ceilometer-api':
diff --git a/modules/openstack/manifests/clientlib.pp
b/modules/openstack/manifests/clientlib.pp
index 1827790..0d811b3 100644
--- a/modules/openstack/manifests/clientlib.pp
+++ b/modules/openstack/manifests/clientlib.pp
@@ -2,7 +2,7 @@
class openstack::clientlib {
include ::openstack::observerenv
include ::openstack
- require openstack2::cloudrepo
+ require ::openstack::repo
$packages = [
'python-novaclient',
diff --git a/modules/openstack/manifests/common.pp
b/modules/openstack/manifests/common.pp
index 488582f..8dc4423 100644
--- a/modules/openstack/manifests/common.pp
+++ b/modules/openstack/manifests/common.pp
@@ -5,6 +5,8 @@
$openstack_version=$::openstack::version,
) {
+ include ::openstack::repo
+
$packages = [
'unzip',
'nova-common',
diff --git a/modules/openstack/manifests/designate/service.pp
b/modules/openstack/manifests/designate/service.pp
index 138cccb..13347a0 100644
--- a/modules/openstack/manifests/designate/service.pp
+++ b/modules/openstack/manifests/designate/service.pp
@@ -13,6 +13,8 @@
)
{
+ require ::openstack::repo
+
$keystone_host_ip = ipresolve($keystone_host,4)
$nova_controller_ip = ipresolve($nova_controller)
$designate_host = $active_server
diff --git a/modules/openstack/manifests/glance/service.pp
b/modules/openstack/manifests/glance/service.pp
index f2be9fd..b0f8678 100644
--- a/modules/openstack/manifests/glance/service.pp
+++ b/modules/openstack/manifests/glance/service.pp
@@ -7,6 +7,8 @@
$openstack_version=$::openstack::version,
$glance_data = '/srv/glance/',
) {
+ include ::openstack::repo
+
$glance_images_dir = "${glance_data}/images"
$keystone_host_ip = ipresolve($keystone_host,4)
$keystone_admin_uri =
"http://${active_server}:${keystoneconfig['auth_port']}"
@@ -32,6 +34,7 @@
package { 'glance':
ensure => present,
+ require => Class['openstack::repo'],
}
file { $glance_data:
diff --git a/modules/openstack/manifests/horizon/service.pp
b/modules/openstack/manifests/horizon/service.pp
index 3a70b66..728b5f0 100644
--- a/modules/openstack/manifests/horizon/service.pp
+++ b/modules/openstack/manifests/horizon/service.pp
@@ -6,10 +6,12 @@
$openstack_version = $::openstack::version,
$webserver_hostname = 'horizon.wikimedia.org'
) {
+ # basic horizon packages and config
+ include ::openstack::repo
package { 'openstack-dashboard':
ensure => present,
- require => Class['::apache::mod::wsgi'];
+ require => Class['openstack::repo', '::apache::mod::wsgi'];
}
require_package('python-keystoneclient')
diff --git a/modules/openstack/manifests/keystone/service.pp
b/modules/openstack/manifests/keystone/service.pp
index d6ae287..df0f996 100644
--- a/modules/openstack/manifests/keystone/service.pp
+++ b/modules/openstack/manifests/keystone/service.pp
@@ -1,10 +1,12 @@
# keystone is the identity service of openstack
# http://docs.openstack.org/developer/keystone/
class openstack::keystone::service($keystoneconfig,
$openstack_version=$::openstack::version) {
+ include ::openstack::repo
include ::openstack::keystone::hooks
package { 'keystone':
ensure => present,
+ require => Class['openstack::repo'];
}
package { 'python-oath':
ensure => present,
diff --git a/modules/openstack/manifests/nova/api.pp
b/modules/openstack/manifests/nova/api.pp
index ec0ddaf..ef3da74 100644
--- a/modules/openstack/manifests/nova/api.pp
+++ b/modules/openstack/manifests/nova/api.pp
@@ -1,9 +1,11 @@
# This is the api service for Openstack Nova.
# It provides a REST api that Wikitech and Horizon use to manage VMs.
class openstack::nova::api($novaconfig,
$openstack_version=$::openstack::version) {
+ include ::openstack::repo
package { 'nova-api':
ensure => present,
+ require => Class['openstack::repo'];
}
service { 'nova-api':
diff --git a/modules/openstack/manifests/nova/compute.pp
b/modules/openstack/manifests/nova/compute.pp
index fdb71fd..4836fff 100644
--- a/modules/openstack/manifests/nova/compute.pp
+++ b/modules/openstack/manifests/nova/compute.pp
@@ -5,6 +5,7 @@
$novaconfig,
$openstack_version=$::openstack::version
){
+ include ::openstack::repo
if ( $::realm == 'production' ) {
$certname = "labvirt-star.${::site}.wmnet"
@@ -131,7 +132,7 @@
'virt-top',
]:
ensure => present,
- require => Package['qemu-system'],
+ require => [Class['openstack::repo'], Package['qemu-system']],
}
}
@@ -154,6 +155,7 @@
# which is somewhat broken.
package { 'qemu-system':
ensure => present,
+ require => Class['openstack::repo'],
}
# qemu-kvm and qemu-system are alternative packages to meet the needs of
diff --git a/modules/openstack/manifests/nova/conductor.pp
b/modules/openstack/manifests/nova/conductor.pp
index e593650..dfb65b3 100644
--- a/modules/openstack/manifests/nova/conductor.pp
+++ b/modules/openstack/manifests/nova/conductor.pp
@@ -4,9 +4,11 @@
# http://blog.russellbryant.net/2012/11/19/a-new-nova-service-nova-conductor/
class openstack::nova::conductor {
+ include ::openstack::repo
package { 'nova-conductor':
ensure => present,
+ require => Class['openstack::repo'];
}
if $::fqdn == hiera('labs_nova_controller') {
diff --git a/modules/openstack/manifests/nova/network.pp
b/modules/openstack/manifests/nova/network.pp
index 4087f00..f941e31 100644
--- a/modules/openstack/manifests/nova/network.pp
+++ b/modules/openstack/manifests/nova/network.pp
@@ -2,11 +2,13 @@
# we hope to replace it with Neutron.
# http://docs.openstack.org/openstack-ops/content/nova-network-deprecation.html
class openstack::nova::network($novaconfig,
$openstack_version=$::openstack::version) {
+ include ::openstack::repo
$tftp_host = 'install1002.wikimedia.org'
package { [ 'nova-network', 'dnsmasq' ]:
ensure => present,
+ require => Class['openstack::repo'];
}
# dnsmasq is run manually by nova-network, we don't want the service
running
diff --git a/modules/openstack/manifests/nova/scheduler.pp
b/modules/openstack/manifests/nova/scheduler.pp
index b5c000e..48d4ebb 100644
--- a/modules/openstack/manifests/nova/scheduler.pp
+++ b/modules/openstack/manifests/nova/scheduler.pp
@@ -3,9 +3,11 @@
class openstack::nova::scheduler(
$openstack_version=$::openstack::version,
){
+ include ::openstack::repo
package { 'nova-scheduler':
ensure => present,
+ require => Class['openstack::repo'];
}
file {
'/usr/lib/python2.7/dist-packages/nova/scheduler/filters/scheduler_pool_filter.py':
diff --git a/modules/openstack/manifests/nova/spiceproxy.pp
b/modules/openstack/manifests/nova/spiceproxy.pp
index c9071e5..a317af8 100644
--- a/modules/openstack/manifests/nova/spiceproxy.pp
+++ b/modules/openstack/manifests/nova/spiceproxy.pp
@@ -5,9 +5,11 @@
class openstack::nova::spiceproxy(
$openstack_version=$::openstack::version,
){
+ include ::openstack::repo
package { ['nova-spiceproxy', 'nova-consoleauth', 'spice-html5',
'websockify']:
ensure => present,
+ require => Class['openstack::repo'];
}
# The default spice_auto.html file doesn't support wss so won't
diff --git a/modules/openstack/manifests/queue_server.pp
b/modules/openstack/manifests/queue_server.pp
index 8ca370d..14b7c0b 100644
--- a/modules/openstack/manifests/queue_server.pp
+++ b/modules/openstack/manifests/queue_server.pp
@@ -4,8 +4,11 @@
$rabbit_monitor_password
) {
+ include ::openstack::repo
+
package { [ 'rabbitmq-server' ]:
ensure => present,
+ require => Class['openstack::repo'];
}
# Turn up the number of allowed file handles for rabbitmq
diff --git a/modules/openstack2/manifests/cloudrepo.pp
b/modules/openstack2/manifests/cloudrepo.pp
deleted file mode 100644
index c3736f3..0000000
--- a/modules/openstack2/manifests/cloudrepo.pp
+++ /dev/null
@@ -1,42 +0,0 @@
-# sets upt APT repository for labs openstack.
-# We use the Ubuntu cloud archive for this -- this repo points us to the
-# package versions specified in $::openstack::version
-
-# class default kept here until components not yet moved to profiles
-# for parameterization are completed in modules/openstack
-
-class openstack2::cloudrepo(
- $version='liberty',
-) {
- # As of 26/10/2015 we support kilo on trusty (lsb_release -c)
- if ($::lsbdistcodename == 'trusty') {
- apt::repository { 'ubuntucloud':
- uri => 'http://ubuntu-cloud.archive.canonical.com/ubuntu',
- dist => "trusty-updates/${version}",
- components => 'main',
- keyfile => 'puppet:///modules/openstack/ubuntu-cloud.key';
- }
- } elsif os_version('debian jessie') {
- # Stock Jessie seems to come with Liberty packages, so only set
- # up a special repo for non-Liberty packages
- if ($version != 'liberty') {
- apt::conf { "mirantis-${version}-jessie-proxy":
- priority => '80',
- key =>
"Acquire::http::Proxy::${version}-jessie.pkgs.mirantis.com",
- value => "http://webproxy.${::site}.wmnet:8080";,
- }
- apt::repository { 'mirantis':
- uri =>
"http://${version}-jessie.pkgs.mirantis.com/debian";,
- dist => "jessie-${version}-backports",
- components => 'main',
- keyfile =>
"puppet:///modules/openstack/mirantis-${version}.key";
- }
- apt::repository { 'mirantis-nochange':
- uri =>
"http://${version}-jessie.pkgs.mirantis.com/debian";,
- dist => "jessie-${version}-backports-nochange",
- components => 'main',
- keyfile =>
"puppet:///modules/openstack/mirantis-${version}.key";
- }
- }
- }
-}
diff --git a/modules/profile/manifests/openstack/base/cloudrepo.pp
b/modules/profile/manifests/openstack/base/cloudrepo.pp
deleted file mode 100644
index 9746d0f..0000000
--- a/modules/profile/manifests/openstack/base/cloudrepo.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-class profile::openstack::base::cloudrepo(
- $version = hiera('profile::openstack::version'),
-){
- class { '::openstack2::cloudrepo':
- version => $version,
- }
-}
diff --git a/modules/profile/manifests/openstack/labtest/cloudrepo.pp
b/modules/profile/manifests/openstack/labtest/cloudrepo.pp
deleted file mode 100644
index fe72764..0000000
--- a/modules/profile/manifests/openstack/labtest/cloudrepo.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-class profile::openstack::labtest::cloudrepo(
- $version = hiera('profile::openstack::labtest::version'),
-){
- class { '::profile::openstack::base::cloudrepo':
- version => $version
- }
-}
diff --git a/modules/profile/manifests/openstack/labtestn/cloudrepo.pp
b/modules/profile/manifests/openstack/labtestn/cloudrepo.pp
deleted file mode 100644
index 50cfb97..0000000
--- a/modules/profile/manifests/openstack/labtestn/cloudrepo.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-class profile::openstack::labtestn::cloudrepo(
- $version = hiera('profile::openstack::labtestn::version'),
-){
- class { '::profile::openstack::base::cloudrepo':
- version => $version
- }
-}
diff --git a/modules/profile/manifests/openstack/main/cloudrepo.pp
b/modules/profile/manifests/openstack/main/cloudrepo.pp
deleted file mode 100644
index 7df672c..0000000
--- a/modules/profile/manifests/openstack/main/cloudrepo.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-class profile::openstack::main::cloudrepo(
- $version = hiera('profile::openstack::main::version'),
-){
- class { '::profile::openstack::base::cloudrepo':
- version => $version
- }
-}
diff --git a/modules/role/manifests/wmcloud/openstack/control.pp
b/modules/role/manifests/wmcloud/openstack/control.pp
new file mode 100644
index 0000000..7608340
--- /dev/null
+++ b/modules/role/manifests/wmcloud/openstack/control.pp
@@ -0,0 +1,3 @@
+class role::wmcloud::openstack::control {
+ include ::profile::rabbitmq::server
+}
diff --git a/modules/role/manifests/wmcs/openstack/labtest/control.pp
b/modules/role/manifests/wmcs/openstack/labtest/control.pp
deleted file mode 100644
index 01dd0b9..0000000
--- a/modules/role/manifests/wmcs/openstack/labtest/control.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class role::wmcs::openstack::labtest::control {
- include profile::openstack::labtest::cloudrepo
-}
diff --git a/modules/role/manifests/wmcs/openstack/labtest/net.pp
b/modules/role/manifests/wmcs/openstack/labtest/net.pp
deleted file mode 100644
index e96d15d..0000000
--- a/modules/role/manifests/wmcs/openstack/labtest/net.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class role::wmcs::openstack::labtest::net {
- include profile::openstack::labtest::cloudrepo
-}
diff --git a/modules/role/manifests/wmcs/openstack/labtest/services.pp
b/modules/role/manifests/wmcs/openstack/labtest/services.pp
deleted file mode 100644
index 690b2b2..0000000
--- a/modules/role/manifests/wmcs/openstack/labtest/services.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class role::wmcs::openstack::labtest::services {
- include profile::openstack::labtest::cloudrepo
-}
diff --git a/modules/role/manifests/wmcs/openstack/labtest/virt.pp
b/modules/role/manifests/wmcs/openstack/labtest/virt.pp
deleted file mode 100644
index 263c862..0000000
--- a/modules/role/manifests/wmcs/openstack/labtest/virt.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class role::wmcs::openstack::labtest::virt {
- include profile::openstack::labtest::cloudrepo
-}
diff --git a/modules/role/manifests/wmcs/openstack/labtest/web.pp
b/modules/role/manifests/wmcs/openstack/labtest/web.pp
deleted file mode 100644
index a742a98..0000000
--- a/modules/role/manifests/wmcs/openstack/labtest/web.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class role::wmcs::openstack::labtest::web {
- include profile::openstack::labtest::cloudrepo
-}
diff --git a/modules/role/manifests/wmcs/openstack/labtestn/control.pp
b/modules/role/manifests/wmcs/openstack/labtestn/control.pp
deleted file mode 100644
index 5001124..0000000
--- a/modules/role/manifests/wmcs/openstack/labtestn/control.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class role::wmcs::openstack::labtestn::control {
- include profile::openstack::labtestn::cloudrepo
-}
diff --git a/modules/role/manifests/wmcs/openstack/labtestn/net.pp
b/modules/role/manifests/wmcs/openstack/labtestn/net.pp
deleted file mode 100644
index cba119a..0000000
--- a/modules/role/manifests/wmcs/openstack/labtestn/net.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class role::wmcs::openstack::labtestn::net {
- include profile::openstack::labtestn::cloudrepo
-}
diff --git a/modules/role/manifests/wmcs/openstack/labtestn/services.pp
b/modules/role/manifests/wmcs/openstack/labtestn/services.pp
deleted file mode 100644
index f0762b5..0000000
--- a/modules/role/manifests/wmcs/openstack/labtestn/services.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class role::wmcs::openstack::labtestn::services {
- include profile::openstack::labtestn::cloudrepo
-}
diff --git a/modules/role/manifests/wmcs/openstack/labtestn/virt.pp
b/modules/role/manifests/wmcs/openstack/labtestn/virt.pp
deleted file mode 100644
index 13b1925..0000000
--- a/modules/role/manifests/wmcs/openstack/labtestn/virt.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class role::wmcs::openstack::labtestn::virt {
- include profile::openstack::labtestn::cloudrepo
-}
diff --git a/modules/role/manifests/wmcs/openstack/labtestn/web.pp
b/modules/role/manifests/wmcs/openstack/labtestn/web.pp
deleted file mode 100644
index 70b727b..0000000
--- a/modules/role/manifests/wmcs/openstack/labtestn/web.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class role::wmcs::openstack::labtestn::web {
- include profile::openstack::labtestn::cloudrepo
-}
diff --git a/modules/role/manifests/wmcs/openstack/main/control.pp
b/modules/role/manifests/wmcs/openstack/main/control.pp
deleted file mode 100644
index d8d4910..0000000
--- a/modules/role/manifests/wmcs/openstack/main/control.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class role::wmcs::openstack::main::control {
- include profile::openstack::main::cloudrepo
-}
diff --git a/modules/role/manifests/wmcs/openstack/main/horizon.pp
b/modules/role/manifests/wmcs/openstack/main/horizon.pp
deleted file mode 100644
index 1632c0a..0000000
--- a/modules/role/manifests/wmcs/openstack/main/horizon.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-# All profiles should fold into role::wmcs::openstack::main::web
-# when labweb* is finished
-class role::wmcs::openstack::main::horizon {
- include profile::openstack::main::cloudrepo
-}
diff --git a/modules/role/manifests/wmcs/openstack/main/net.pp
b/modules/role/manifests/wmcs/openstack/main/net.pp
deleted file mode 100644
index 8e5d489..0000000
--- a/modules/role/manifests/wmcs/openstack/main/net.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class role::wmcs::openstack::main::net {
- include profile::openstack::main::cloudrepo
-}
diff --git a/modules/role/manifests/wmcs/openstack/main/net_secondary.pp
b/modules/role/manifests/wmcs/openstack/main/net_secondary.pp
deleted file mode 100644
index d132aa4..0000000
--- a/modules/role/manifests/wmcs/openstack/main/net_secondary.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class role::wmcs::openstack::main::net_secondary {
- include profile::openstack::main::cloudrepo
-}
diff --git a/modules/role/manifests/wmcs/openstack/main/services.pp
b/modules/role/manifests/wmcs/openstack/main/services.pp
deleted file mode 100644
index 340d369..0000000
--- a/modules/role/manifests/wmcs/openstack/main/services.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class role::wmcs::openstack::main::services {
- include profile::openstack::main::cloudrepo
-}
diff --git a/modules/role/manifests/wmcs/openstack/main/virt.pp
b/modules/role/manifests/wmcs/openstack/main/virt.pp
deleted file mode 100644
index eaee59f..0000000
--- a/modules/role/manifests/wmcs/openstack/main/virt.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class role::wmcs::openstack::main::virt {
- include profile::openstack::main::cloudrepo
-}
diff --git a/modules/role/manifests/wmcs/openstack/main/web.pp
b/modules/role/manifests/wmcs/openstack/main/web.pp
deleted file mode 100644
index 78ba6ff..0000000
--- a/modules/role/manifests/wmcs/openstack/main/web.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class role::wmcs::openstack::main::web {
- include profile::openstack::main::cloudrepo
-}
diff --git a/modules/role/manifests/wmcs/openstack/main/wikitech.pp
b/modules/role/manifests/wmcs/openstack/main/wikitech.pp
deleted file mode 100644
index 4e888bf..0000000
--- a/modules/role/manifests/wmcs/openstack/main/wikitech.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class role::wmcs::openstack::main::wikitech {
- include profile::openstack::main::cloudrepo
-}
--
To view, visit https://gerrit.wikimedia.org/r/368332
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I56be86825582ff578b161a2a394a3a5a6df7411c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[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
