From c889b2f2bbd432ed78b2b09c41e14864eb8f261a Mon Sep 17 00:00:00 2001 From: thomashaw Date: Wed, 21 Mar 2018 22:44:50 +0000 Subject: [PATCH] WiP: cron and mode change --- lib/helpers/ovirt.rb | 7 +++---- .../wordpress/templates/wordpress_conf.sh.erb | 11 ++++------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/lib/helpers/ovirt.rb b/lib/helpers/ovirt.rb index 0bcc2970f..b358541e2 100644 --- a/lib/helpers/ovirt.rb +++ b/lib/helpers/ovirt.rb @@ -172,15 +172,14 @@ class OVirtFunctions vms = [] ovirt_vm_names = build_ovirt_names(scenario_path, username, vm_names) - Print.std "Searching for VMs owned by #{username}" + Print.std "Searching for VMs owned by #{username} #{ovirt_vm_names}" ovirt_vm_names.each do |vm_name| vms << vms_service(ovirt_connection).list(search: "name=#{vm_name}") end - Print.std "Found VMs: #{vms}" - + vms.each do |vm_list| vm_list.each do |vm| - Print.std " VM: #{vm.name}" + Print.std " Found VM: #{vm.name}" # find the service that manages that vm vm_service = vms_service(ovirt_connection).vm_service(vm.id) diff --git a/modules/utilities/unix/puppet_module/wordpress/templates/wordpress_conf.sh.erb b/modules/utilities/unix/puppet_module/wordpress/templates/wordpress_conf.sh.erb index 4427233d8..48b2110a7 100644 --- a/modules/utilities/unix/puppet_module/wordpress/templates/wordpress_conf.sh.erb +++ b/modules/utilities/unix/puppet_module/wordpress/templates/wordpress_conf.sh.erb @@ -20,10 +20,7 @@ $params += '&language=' end -%> -if [ ! -f /wps ]; then - curl -L <%= @https ? '-k ': '' %><%= $url_base %> - sleep 10 - curl -L --data '<%= $params %>' <%= @https ? '-k ': '' %><%= $url_base %>/wp-admin/install.php?step=2 - sleep 10 - touch /wps -fi \ No newline at end of file +curl -L <%= @https ? '-k ': '' %><%= $url_base %> +sleep 10 +curl -L --data '<%= $params %>' <%= @https ? '-k ': '' %><%= $url_base %>/wp-admin/install.php?step=2 +sleep 10 \ No newline at end of file