Skip to content

Commit cd5ba1d

Browse files
author
mruzicka
committed
add slice creation
1 parent 88e771e commit cd5ba1d

File tree

3 files changed

+55
-4
lines changed

3 files changed

+55
-4
lines changed

modules/yoxos/files/yoxos_setup_util.rb

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,19 @@
33
require 'puppet/external/pson/version'
44
require 'puppet/external/pson/pure'
55

6+
def read_data(files)
7+
return nil if files.empty?
8+
9+
data = ''
10+
files.each() do |file|
11+
File.open(file, 'r') do |handle|
12+
data << handle.read()
13+
end
14+
end
15+
16+
data
17+
end
18+
619
def send_request(method, request, data = nil)
720
method = ('request_' << method).to_sym
821
response = Net::HTTP.new('localhost', 8080).send(method, request, data)
@@ -31,7 +44,15 @@ def wait_for_completion(uri)
3144
exit data['setup'] ? 0 : 1
3245
when 'put'
3346
# run the setup
34-
data = send_request(command, request)
47+
data = read_data(ARGV)
48+
data = send_request(command, request, data)
49+
data = wait_for_completion(URI(data['information']))
50+
51+
exit data['status'].casecmp('Ok') == 0 ? 0 : 1
52+
when 'post'
53+
# add the slice
54+
data = read_data(ARGV)
55+
data = send_request(command, request, data)
3556
data = wait_for_completion(URI(data['information']))
3657

3758
exit data['status'].casecmp('Ok') == 0 ? 0 : 1

modules/yoxos/manifests/init.pp

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515

1616
$setup_util = '/usr/local/lib/yoxos_setup_util.rb'
1717

18+
$couchdb_admin_login_uri_escaped = uri_escape($couchdb_admin_login)
19+
$couchdb_admin_password_uri_escaped = uri_escape($couchdb_admin_password)
20+
1821
exec { "create-${data_root}":
1922
unless => "test -d \"${data_root}\"",
2023
command => "mkdir -p \"${data_root}\"",
@@ -78,9 +81,6 @@
7881
subscribe => Service['couchdb'],
7982
}
8083

81-
$couchdb_admin_login_uri_escaped = uri_escape($couchdb_admin_login)
82-
$couchdb_admin_password_uri_escaped = uri_escape($couchdb_admin_password)
83-
8484
exec { 'setup-yesa-documents':
8585
unless => "ruby \"${setup_util}\" get /accountadmin/setup",
8686
command => "ruby \"${setup_util}\" put \"/accountadmin/setup?username=${couchdb_admin_login_uri_escaped}&password=${couchdb_admin_password_uri_escaped}&overwrite=true\"",
@@ -97,4 +97,20 @@
9797
require => [Package['apache2'], Service['tomcat6']],
9898
notify => Service['apache2'],
9999
}
100+
101+
file { "${data_root}/../slice.properties":
102+
ensure => present,
103+
content => template('yoxos/slice.properties.erb'),
104+
owner => root,
105+
group => root,
106+
mode => 0644,
107+
require => File[$data_root],
108+
}
109+
110+
exec { 'create-yesa-slice':
111+
# unless => "ruby \"${setup_util}\" get /accountadmin/listSlices",
112+
command => "ruby \"${setup_util}\" post \"/accountadmin/createSlice?username=${couchdb_admin_login_uri_escaped}&password=${couchdb_admin_password_uri_escaped}\" \"${data_root}/../slice.properties\"",
113+
path => ['/usr/local/bin', '/bin', '/usr/bin'],
114+
require => [Exec['setup-yesa-documents'], File["${data_root}/../slice.properties"]],
115+
}
100116
}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
extra.metadata.repositories=
2+
place.id=yoxos
3+
slice.id=3.7.2.20120309-0953
4+
yoxos.distribution.name=
5+
parent.slice=1.0.0.20120309-0947
6+
locked.repositories=
7+
metadata.repositories=http\://download.eclipse.org/eclipse/updates/3.7,http\://viplugin.com
8+
extra.artifact.repositories=
9+
global.whitelist=
10+
global.blacklist=
11+
whitelist.http\://download.eclipse.org/eclipse/updates/3.7=org.eclipse.jdt.feature.group
12+
artifact.repositories=http\://download.eclipse.org/eclipse/updates/3.7,http\://viplugin.com
13+
whitelist.http\://viplugin.com=com.mbartl.viplugin.eclipse.feature.group
14+
slice.name=

0 commit comments

Comments
 (0)