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.

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

cloud/tencentcloud: add tencentcloud support for salt-cloud #54518

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions conf/cloud.profiles
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,14 @@
# script: Fedora
# minion:
# cheese: edam

#tencentcloud-guangzhou-s1sm1:
# provider: my-tencentcloud-config
# availability_zone: ap-guangzhou-3
# image: img-31tjrtph
# size: S1.SMALL1
# allocate_public_ip: True
# internet_max_bandwidth_out: 1
# password: '153e41ec96140152'
# securitygroups:
# - sg-5e90804b
10 changes: 10 additions & 0 deletions conf/cloud.profiles.d/tencentcloud-guangzhou-s1sm1.profiles
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#tencentcloud-guangzhou-s1sm1:
# provider: my-tencentcloud-config
# availability_zone: ap-guangzhou-3
# image: img-31tjrtph
# size: S1.SMALL1
# allocate_public_ip: True
# internet_max_bandwidth_out: 1
# password: '153e41ec96140152'
# securitygroups:
# - sg-5e90804b
9 changes: 9 additions & 0 deletions conf/cloud.providers
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,12 @@

#my-scaleway-config:
# driver: scaleway

#my-tencentcloud-config:
# driver: tencentcloud
# TencentCloud Secret Id
# id: AKIDA64pOio9BMemkApzevX0HS169S4b750A
# TencentCloud Secret Key
# key: 8r2xmPn0C5FDvRAlmcJimiTZKVRsk260
# TencentCloud Region
# location: ap-guangzhou
8 changes: 8 additions & 0 deletions conf/cloud.providers.d/tencent.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#my-tencentcloud-config:
# driver: tencentcloud
# TencentCloud Secret Id
# id: AKIDA64pOio9BMemkApzevX0HS169S4b750A
# TencentCloud Secret Key
# key: 8r2xmPn0C5FDvRAlmcJimiTZKVRsk260
# TencentCloud Region
# location: ap-guangzhou
12 changes: 12 additions & 0 deletions doc/.tx/config
Original file line number Diff line number Diff line change
Expand Up @@ -3092,6 +3092,12 @@ source_file = _build/locale/ref/clouds/all/salt.cloud.clouds.softlayer.pot
source_lang = en
source_name = ref/clouds/all/salt.cloud.clouds.softlayer.rst

[salt.ref--clouds--all--salt_cloud_clouds_tencentcloud]
file_filter = locale/<lang>/LC_MESSAGES/ref/clouds/all/salt.cloud.clouds.tencentcloud.po
source_file = _build/locale/ref/clouds/all/salt.cloud.clouds.tencentcloud.pot
source_lang = en
source_name = ref/clouds/all/salt.cloud.clouds.tencentcloud.rst

[salt.topics--cloud--action]
file_filter = locale/<lang>/LC_MESSAGES/topics/cloud/action.po
source_file = _build/locale/topics/cloud/action.pot
Expand Down Expand Up @@ -3488,6 +3494,12 @@ source_file = _build/locale/topics/cloud/salt.pot
source_lang = en
source_name = topics/cloud/salt.rst

[salt.topics--cloud--tencentcloud]
file_filter = locale/<lang>/LC_MESSAGES/topics/cloud/tencentcloud.po
source_file = _build/locale/topics/cloud/tencentcloud.pot
source_lang = en
source_name = topics/cloud/tencentcloud.rst

[salt.topics--cloud--troubleshooting]
file_filter = locale/<lang>/LC_MESSAGES/topics/cloud/troubleshooting.po
source_file = _build/locale/topics/cloud/troubleshooting.pot
Expand Down
1 change: 1 addition & 0 deletions doc/ref/clouds/all/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ cloud modules
scaleway
softlayer
softlayer_hw
tencentcloud
vagrant
virtualbox
vmware
Expand Down
6 changes: 6 additions & 0 deletions doc/ref/clouds/all/salt.cloud.clouds.tencentcloud.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
==============================
salt.cloud.clouds.tencentcloud
==============================

.. automodule:: salt.cloud.clouds.tencentcloud
:members:
2 changes: 2 additions & 0 deletions doc/spelling_wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -815,6 +815,8 @@ tarball
tbz
tcp
templating
tencent
tencentcloud
testrb
tgt
tgz
Expand Down
276 changes: 138 additions & 138 deletions doc/topics/cloud/features.rst

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions doc/topics/cloud/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ Cloud Provider Specifics
Getting Started With Scaleway <scaleway>
Getting Started With Saltify <saltify>
Getting Started With SoftLayer <softlayer>
Getting Started With TencentCloud <tencentcloud>
Getting Started With Vagrant <vagrant>
Getting Started With Vexxhost <vexxhost>
Getting Started With Virtualbox <virtualbox>
Expand Down
Loading