Rush has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/339064 )
Change subject: nova: run fullstack test suite on current labnet
......................................................................
nova: run fullstack test suite on current labnet
Make this a role, and parameterize to that effect.
Change-Id: Iee7a6966b9de2a48be6023bfeb2f3209638dabdc
---
M manifests/site.pp
M modules/openstack/manifests/nova/fullstack.pp
M modules/openstack/templates/initscripts/nova-fullstack.upstart.erb
A modules/role/manifests/labs/openstack/nova/fullstack.pp
4 files changed, 27 insertions(+), 8 deletions(-)
Approvals:
Rush: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index cf569c8..d1ab29d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1412,7 +1412,9 @@
}
node 'labnet1001.eqiad.wmnet' {
- role(labs::openstack::nova::api, labs::openstack::nova::network)
+ role(labs::openstack::nova::api,
+ labs::openstack::nova::network,
+ labs::openstack::nova::fullstack)
include ::standard
}
diff --git a/modules/openstack/manifests/nova/fullstack.pp
b/modules/openstack/manifests/nova/fullstack.pp
index b434c55..4e005a9 100644
--- a/modules/openstack/manifests/nova/fullstack.pp
+++ b/modules/openstack/manifests/nova/fullstack.pp
@@ -1,7 +1,13 @@
-class openstack::nova::fullstack {
+# [*password*]
+# password for fullstack test user (same across backends)
+#
+# [*interval*]
+# seconds between fullstack test runs
- $novaconfig = hiera_hash('novaconfig', {})
- $fullstack_pass = $novaconfig['osstackcanary_pass']
+class openstack::nova::fullstack(
+ $password,
+ $interval = 300,
+ ) {
group { 'osstackcanary':
ensure => present,
@@ -26,7 +32,8 @@
source => 'puppet:///modules/openstack/nova_fullstack_test.py',
}
- file { '/var/lib/osstackcanary/osstackcanary_id':
+ $keyfile = '/var/lib/osstackcanary/osstackcanary_id'
+ file { $keyfile:
ensure => present,
mode => '0600',
owner => 'osstackcanary',
diff --git a/modules/openstack/templates/initscripts/nova-fullstack.upstart.erb
b/modules/openstack/templates/initscripts/nova-fullstack.upstart.erb
index 40f024a..4003586 100644
--- a/modules/openstack/templates/initscripts/nova-fullstack.upstart.erb
+++ b/modules/openstack/templates/initscripts/nova-fullstack.upstart.erb
@@ -14,14 +14,14 @@
script
export OS_USERNAME="osstackcanary"
- export OS_PASSWORD="<%= @fullstack_pass %>"
+ export OS_PASSWORD="<%= @password %>"
/usr/local/sbin/nova-fullstack
- --interval 600 \
+ --interval <%= @interval %> \
--max-pool 1 \
--project admin-monitoring \
--prepend fullstackd \
--image debian-8.6-jessie \
--flavor m1.small \
- --keyfile
/var/lib/osstackcanary/osstackcanary_id \
+ --keyfile <%= @keyfile %> \
--statsd statsd.eqiad.wmnet
end script
diff --git a/modules/role/manifests/labs/openstack/nova/fullstack.pp
b/modules/role/manifests/labs/openstack/nova/fullstack.pp
new file mode 100644
index 0000000..906eb77
--- /dev/null
+++ b/modules/role/manifests/labs/openstack/nova/fullstack.pp
@@ -0,0 +1,10 @@
+class role::labs::openstack::nova::fullstack {
+ system::role { $name: }
+
+ $novaconfig = hiera_hash('novaconfig', {})
+ $fullstack_pass = $novaconfig['osstackcanary_pass']
+
+ class { '::openstack::nova::fullstack':
+ password => $fullstack_pass,
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/339064
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iee7a6966b9de2a48be6023bfeb2f3209638dabdc
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <[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
