Rush has submitted this change and it was merged.
Change subject: remove labs::openstack::nova::common from nodepool
......................................................................
remove labs::openstack::nova::common from nodepool
This causes dupe package issues and such but
also seems to be pulling in nova::common
for novaconfig only, and in general one
novaconfig param. We can pull this directly
from hiera in a cleaner manner.
Revert "openstackclient package declaration dupe"
This reverts commit 3321ccfb882c32cc841dc13ca0b20a6f8a6a0414.
Change-Id: I0cfcac40fbd748e45baed4477fba862addabcabc
---
M manifests/role/nodepool.pp
M modules/nodepool/manifests/init.pp
2 files changed, 10 insertions(+), 7 deletions(-)
Approvals:
Rush: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/nodepool.pp b/manifests/role/nodepool.pp
index 521a7e0..2ea315b 100644
--- a/manifests/role/nodepool.pp
+++ b/manifests/role/nodepool.pp
@@ -8,9 +8,7 @@
system::role { 'role::nodepool': description => 'CI Nodepool' }
- include passwords::nodepool
- include role::labs::openstack::nova::common
- $novaconfig = $role::labs::openstack::nova::common::novaconfig
+ $nova_controller = hiera('labs_nova_controller')
# dib scripts
git::clone { 'integration/config':
@@ -33,7 +31,7 @@
jenkins_credentials_id => 'nodepool-dib-jenkins',
jenkins_ssh_public_key => 'ssh-rsa
AAAAB3NzaC1yc2EAAAADAQABAAABAQDrERFfjRBOIoI5ASW0gx/rxSeJX/ThszByypsoA80jCfbcjrfsG94WtOGXYQw4Zjs/8u4DYMfI5aHEZKvk/K4jTAR09J9swFash9ML60AvQx/VFC5ZEDHMBa7dYyzxspDX5v73QEDYG9Hhxo6qfFOLO3IvYfat9CfwQR4/oS2lzV+oIsD68lSy/OoKCpywMs0/pExdP65RHR7xpvAlrgehzKoayfHo5Vzg9dCawj4ZoHsqwCnKG4ctMflyzyN/Lwgniv/+GSjgqf/FNXDCMDJCh+d410IXLS7szY3JTzpWekF82SxIM19CdwKh1R2zPVjUT6hvbm9kOo8Y72ORL2yj
nodepool@labnodepool1001',
jenkins_ssh_private_key => secret('nodepool/dib_jenkins_id_rsa'),
- openstack_auth_url => "${novaconfig['auth_uri']}/v2.0",
+ openstack_auth_url => "http://${nova_controller}:5000/v2.0";,
openstack_username => 'nodepoolmanager',
openstack_password => $passwords::nodepool::manager_pass,
openstack_tenant_id => 'contintcloud',
@@ -44,4 +42,5 @@
contact_group => 'contint',
nrpe_command => '/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u
nodepool --ereg-argument-array="^/usr/bin/python /usr/bin/nodepoold -d"',
}
+
}
diff --git a/modules/nodepool/manifests/init.pp
b/modules/nodepool/manifests/init.pp
index 343de6a..f094a6c 100644
--- a/modules/nodepool/manifests/init.pp
+++ b/modules/nodepool/manifests/init.pp
@@ -88,12 +88,16 @@
priority => '1001',
before => Package['nodepool'],
}
-
- # OpenStack CLI
apt::pin { 'python-openstackclient':
pin => 'release a=jessie-wikimedia c=backports',
priority => '1001',
- before => [Package['nodepool'],Package['python-openstackclient']],
+ before => Package['nodepool'],
+ }
+
+ # OpenStack CLI
+ package { 'python-openstackclient':
+ ensure => present,
+ require => Apt::Pin['python-openstackclient'],
}
# python-diskimage-builder 0.1.46 missing dependency:
--
To view, visit https://gerrit.wikimedia.org/r/254297
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0cfcac40fbd748e45baed4477fba862addabcabc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <r...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Rush <r...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
