Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cloudscale: fix boilerplate #63533

Merged
merged 1 commit into from
Oct 16, 2019
Merged

cloudscale: fix boilerplate #63533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/ansible/module_utils/cloudscale.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ def cloudscale_argument_spec():
return dict(
api_token=dict(fallback=(env_fallback, ['CLOUDSCALE_API_TOKEN']),
no_log=True,
required=True),
required=True,
type='str'),
api_timeout=dict(default=30, type='int'),
)

Expand Down
1 change: 1 addition & 0 deletions lib/ansible/modules/cloud/cloudscale/cloudscale_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
image:
description:
- Image used to create the server.
type: str
volume_size_gb:
description:
- Size of the root volume in GB.
Expand Down
5 changes: 5 additions & 0 deletions lib/ansible/plugins/doc_fragments/cloudscale.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
# Copyright (c) 2019, René Moser <mail@renemoser.net>
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

from __future__ import absolute_import, division, print_function
__metaclass__ = type


class ModuleDocFragment(object):

Expand All @@ -12,10 +15,12 @@ class ModuleDocFragment(object):
description:
- cloudscale.ch API token.
- This can also be passed in the C(CLOUDSCALE_API_TOKEN) environment variable.
type: str
api_timeout:
description:
- Timeout in seconds for calls to the cloudscale.ch API.
default: 30
type: int
notes:
- Instead of the api_token parameter the C(CLOUDSCALE_API_TOKEN) environment variable can be used.
- All operations are performed using the cloudscale.ch public API v1.
Expand Down
3 changes: 3 additions & 0 deletions test/integration/targets/inventory_cloudscale/filter_plugins/group_name.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
from __future__ import absolute_import, division, print_function
__metaclass__ = type

from ansible.inventory.group import to_safe_group_name


Expand Down
12 changes: 0 additions & 12 deletions test/sanity/ignore.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1269,14 +1269,6 @@ lib/ansible/modules/cloud/centurylink/clc_server.py validate-modules:doc-missing
lib/ansible/modules/cloud/centurylink/clc_server_snapshot.py validate-modules:implied-parameter-type-mismatch
lib/ansible/modules/cloud/centurylink/clc_server_snapshot.py validate-modules:parameter-type-not-in-doc
lib/ansible/modules/cloud/centurylink/clc_server_snapshot.py validate-modules:doc-missing-type
lib/ansible/modules/cloud/cloudscale/cloudscale_floating_ip.py validate-modules:parameter-type-not-in-doc
lib/ansible/modules/cloud/cloudscale/cloudscale_floating_ip.py validate-modules:doc-missing-type
lib/ansible/modules/cloud/cloudscale/cloudscale_server.py validate-modules:parameter-type-not-in-doc
lib/ansible/modules/cloud/cloudscale/cloudscale_server.py validate-modules:doc-missing-type
lib/ansible/modules/cloud/cloudscale/cloudscale_server_group.py validate-modules:parameter-type-not-in-doc
lib/ansible/modules/cloud/cloudscale/cloudscale_server_group.py validate-modules:doc-missing-type
lib/ansible/modules/cloud/cloudscale/cloudscale_volume.py validate-modules:parameter-type-not-in-doc
lib/ansible/modules/cloud/cloudscale/cloudscale_volume.py validate-modules:doc-missing-type
lib/ansible/modules/cloud/cloudstack/cs_account.py future-import-boilerplate
lib/ansible/modules/cloud/cloudstack/cs_account.py metaclass-boilerplate
lib/ansible/modules/cloud/cloudstack/cs_affinitygroup.py future-import-boilerplate
Expand Down Expand Up @@ -5715,8 +5707,6 @@ lib/ansible/plugins/doc_fragments/checkpoint_commands.py future-import-boilerpla
lib/ansible/plugins/doc_fragments/checkpoint_commands.py metaclass-boilerplate
lib/ansible/plugins/doc_fragments/checkpoint_objects.py future-import-boilerplate
lib/ansible/plugins/doc_fragments/checkpoint_objects.py metaclass-boilerplate
lib/ansible/plugins/doc_fragments/cloudscale.py future-import-boilerplate
lib/ansible/plugins/doc_fragments/cloudscale.py metaclass-boilerplate
lib/ansible/plugins/doc_fragments/cloudstack.py future-import-boilerplate
lib/ansible/plugins/doc_fragments/cloudstack.py metaclass-boilerplate
lib/ansible/plugins/doc_fragments/cnos.py future-import-boilerplate
Expand Down Expand Up @@ -5949,8 +5939,6 @@ test/integration/targets/inventory_aws_conformance/lib/boto/mocks/instances.py f
test/integration/targets/inventory_aws_conformance/lib/boto/mocks/instances.py metaclass-boilerplate
test/integration/targets/inventory_aws_conformance/lib/boto/session.py future-import-boilerplate
test/integration/targets/inventory_aws_conformance/lib/boto/session.py metaclass-boilerplate
test/integration/targets/inventory_cloudscale/filter_plugins/group_name.py future-import-boilerplate
test/integration/targets/inventory_cloudscale/filter_plugins/group_name.py metaclass-boilerplate
test/integration/targets/inventory_kubevirt_conformance/inventory_diff.py future-import-boilerplate
test/integration/targets/inventory_kubevirt_conformance/inventory_diff.py metaclass-boilerplate
test/integration/targets/inventory_kubevirt_conformance/server.py future-import-boilerplate
Expand Down