mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Resolve revert conflicts
This commit is contained in:
parent
0cabb2fcc4
commit
0a0ed538b2
1 changed files with 0 additions and 32 deletions
|
@ -19,34 +19,19 @@
|
||||||
|
|
||||||
DOCUMENTATION = '''
|
DOCUMENTATION = '''
|
||||||
---
|
---
|
||||||
<<<<<<< HEAD
|
|
||||||
module: rax_files
|
module: rax_files
|
||||||
short_description: Manipulate Rackspace Cloud Files Containers
|
short_description: Manipulate Rackspace Cloud Files Containers
|
||||||
description:
|
description:
|
||||||
- Manipulate Rackspace Cloud Files Containers
|
- Manipulate Rackspace Cloud Files Containers
|
||||||
=======
|
|
||||||
module:
|
|
||||||
short_description: create, fetch, and delete objects in Rackspace Cloud Files
|
|
||||||
description:
|
|
||||||
- Upload, download, and delete objects in Rackspace Cloud Files
|
|
||||||
>>>>>>> parent of c3408f2... Revert "Merge pull request #5540 from angstwad/cf-container-module"
|
|
||||||
version_added: "1.5"
|
version_added: "1.5"
|
||||||
options:
|
options:
|
||||||
api_key:
|
api_key:
|
||||||
description:
|
description:
|
||||||
<<<<<<< HEAD
|
|
||||||
- Rackspace API key (overrides I(credentials))
|
- Rackspace API key (overrides I(credentials))
|
||||||
clear_meta:
|
clear_meta:
|
||||||
description:
|
description:
|
||||||
- Optionally clear existing metadata when applying metadata to existing containers.
|
- Optionally clear existing metadata when applying metadata to existing containers.
|
||||||
Selecting this option is only appropriate when setting type=meta
|
Selecting this option is only appropriate when setting type=meta
|
||||||
=======
|
|
||||||
- Rackspace API key (overrides I(credentials))requirements: [ "pyrax" ]
|
|
||||||
clear_meta:
|
|
||||||
description:
|
|
||||||
- Optionally clear existing metadata when applying metadata to existing containers.
|
|
||||||
- Selecting this option is only appropriate when setting type=meta
|
|
||||||
>>>>>>> parent of c3408f2... Revert "Merge pull request #5540 from angstwad/cf-container-module"
|
|
||||||
choices: ["yes", "no"]
|
choices: ["yes", "no"]
|
||||||
default: "no"
|
default: "no"
|
||||||
container:
|
container:
|
||||||
|
@ -64,14 +49,9 @@ options:
|
||||||
- A hash of items to set as metadata values on a container
|
- A hash of items to set as metadata values on a container
|
||||||
private:
|
private:
|
||||||
description:
|
description:
|
||||||
<<<<<<< HEAD
|
|
||||||
- Used to set a container as private, removing it from the CDN. B(Warning!)
|
- Used to set a container as private, removing it from the CDN. B(Warning!)
|
||||||
Private containers, if previously made public, can have live objects
|
Private containers, if previously made public, can have live objects
|
||||||
available until the TTL on cached objects expires
|
available until the TTL on cached objects expires
|
||||||
=======
|
|
||||||
- Used to set a container as private, removing it from the CDN.
|
|
||||||
- Warning: Private containers, if previously made public, can have live objects available until the TTL on cached objects expires
|
|
||||||
>>>>>>> parent of c3408f2... Revert "Merge pull request #5540 from angstwad/cf-container-module"
|
|
||||||
public:
|
public:
|
||||||
description:
|
description:
|
||||||
- Used to set a container as public, available via the Cloud Files CDN
|
- Used to set a container as public, available via the Cloud Files CDN
|
||||||
|
@ -81,19 +61,11 @@ options:
|
||||||
default: DFW
|
default: DFW
|
||||||
ttl:
|
ttl:
|
||||||
description:
|
description:
|
||||||
<<<<<<< HEAD
|
|
||||||
- In seconds, set a container-wide TTL for all objects cached on CDN edge nodes.
|
- In seconds, set a container-wide TTL for all objects cached on CDN edge nodes.
|
||||||
Setting a TTL is only appropriate for containers that are public
|
Setting a TTL is only appropriate for containers that are public
|
||||||
type:
|
type:
|
||||||
description:
|
description:
|
||||||
- Type of object to do work on, i.e. metadata object or a container object
|
- Type of object to do work on, i.e. metadata object or a container object
|
||||||
=======
|
|
||||||
- In seconds, set a container-wide TTL for all objects cached on CDN edge nodes
|
|
||||||
- Setting a TTL is only appropriate for containers that are public
|
|
||||||
type:
|
|
||||||
description:
|
|
||||||
- Type of object to do work on: metadata object or a container object
|
|
||||||
>>>>>>> parent of c3408f2... Revert "Merge pull request #5540 from angstwad/cf-container-module"
|
|
||||||
choices: ["file", "meta"]
|
choices: ["file", "meta"]
|
||||||
default: "file"
|
default: "file"
|
||||||
username:
|
username:
|
||||||
|
@ -117,10 +89,6 @@ notes:
|
||||||
'''
|
'''
|
||||||
|
|
||||||
EXAMPLES = '''
|
EXAMPLES = '''
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
---
|
|
||||||
>>>>>>> parent of c3408f2... Revert "Merge pull request #5540 from angstwad/cf-container-module"
|
|
||||||
- name: "Test Cloud Files Containers"
|
- name: "Test Cloud Files Containers"
|
||||||
hosts: local
|
hosts: local
|
||||||
gather_facts: no
|
gather_facts: no
|
||||||
|
|
Loading…
Reference in a new issue