Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
ansible
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenEdx
ansible
Commits
709993aa
Commit
709993aa
authored
Oct 07, 2013
by
Michael DeHaan
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4334 from bennojoy/s3
minor fixes
parents
39a81c43
c1198dc1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
library/cloud/s3
+5
-4
No files found.
library/cloud/s3
View file @
709993aa
...
@@ -248,7 +248,7 @@ def main():
...
@@ -248,7 +248,7 @@ def main():
bucket
=
dict
(
required
=
True
),
bucket
=
dict
(
required
=
True
),
object
=
dict
(),
object
=
dict
(),
src
=
dict
(),
src
=
dict
(),
dest
=
dict
(),
dest
=
dict
(
default
=
None
),
mode
=
dict
(
choices
=
[
'get'
,
'put'
,
'delete'
,
'create'
,
'geturl'
,
'getstr'
],
required
=
True
),
mode
=
dict
(
choices
=
[
'get'
,
'put'
,
'delete'
,
'create'
,
'geturl'
,
'getstr'
],
required
=
True
),
expiry
=
dict
(
default
=
600
,
aliases
=
[
'expiration'
]),
expiry
=
dict
(
default
=
600
,
aliases
=
[
'expiration'
]),
s3_url
=
dict
(
aliases
=
[
'S3_URL'
]),
s3_url
=
dict
(
aliases
=
[
'S3_URL'
]),
...
@@ -261,7 +261,8 @@ def main():
...
@@ -261,7 +261,8 @@ def main():
bucket
=
module
.
params
.
get
(
'bucket'
)
bucket
=
module
.
params
.
get
(
'bucket'
)
obj
=
module
.
params
.
get
(
'object'
)
obj
=
module
.
params
.
get
(
'object'
)
src
=
module
.
params
.
get
(
'src'
)
src
=
module
.
params
.
get
(
'src'
)
dest
=
os
.
path
.
expanduser
(
module
.
params
.
get
(
'dest'
))
if
module
.
params
.
get
(
'dest'
):
dest
=
os
.
path
.
expanduser
(
module
.
params
.
get
(
'dest'
))
mode
=
module
.
params
.
get
(
'mode'
)
mode
=
module
.
params
.
get
(
'mode'
)
expiry
=
int
(
module
.
params
[
'expiry'
])
expiry
=
int
(
module
.
params
[
'expiry'
])
s3_url
=
module
.
params
.
get
(
's3_url'
)
s3_url
=
module
.
params
.
get
(
's3_url'
)
...
@@ -404,7 +405,7 @@ def main():
...
@@ -404,7 +405,7 @@ def main():
if
deletertn
is
True
:
if
deletertn
is
True
:
module
.
exit_json
(
msg
=
"Bucket
%
s and all keys have been deleted."
%
bucket
,
changed
=
True
)
module
.
exit_json
(
msg
=
"Bucket
%
s and all keys have been deleted."
%
bucket
,
changed
=
True
)
else
:
else
:
module
.
fail_json
(
msg
=
"Bucket does not exist."
,
failed
=
Tru
e
)
module
.
fail_json
(
msg
=
"Bucket does not exist."
,
changed
=
Fals
e
)
else
:
else
:
module
.
fail_json
(
msg
=
"Bucket parameter is required."
,
failed
=
True
)
module
.
fail_json
(
msg
=
"Bucket parameter is required."
,
failed
=
True
)
...
@@ -416,7 +417,7 @@ def main():
...
@@ -416,7 +417,7 @@ def main():
if
bucketrtn
is
True
:
if
bucketrtn
is
True
:
module
.
exit_json
(
msg
=
"Bucket already exists."
,
changed
=
False
)
module
.
exit_json
(
msg
=
"Bucket already exists."
,
changed
=
False
)
else
:
else
:
created
=
create_bucket
(
module
,
s3
,
bucket
)
module
.
exit_json
(
msg
=
"Bucket created succesfully"
,
changed
=
create_bucket
(
module
,
s3
,
bucket
)
)
if
bucket
and
obj
:
if
bucket
and
obj
:
bucketrtn
=
bucket_check
(
module
,
s3
,
bucket
)
bucketrtn
=
bucket_check
(
module
,
s3
,
bucket
)
if
obj
.
endswith
(
'/'
):
if
obj
.
endswith
(
'/'
):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment