valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update configuration examples for Joyent (#37153)

Browse Source 
* Fix typo in profile example ('private_key' listed twice)
* Reflect Joyent's current new naming convention for VM sizes
* Update docs with modern images that are officially supported by Joyent
* Refresh example output of --list-sizes and --list-images
This commit is contained in:
Eric Radman 2016-10-22 09:58:46 -04:00 committed by Nicole Thomas
parent b65db3ab6f
commit 30146115ee
4 changed files with 49 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
doc/topics/cloud/joyent.rst
View File

@ -51,8 +51,8 @@ Set up an initial profile at ``/etc/salt/cloud.profiles`` or in the
joyent_512 joyent_512
provider: my-joyent-config provider: my-joyent-config
size: Extra Small 512 MB size: g4-highcpu-512M
image: Arch Linux 2013.06 image: ubuntu-16.04
Sizes can be obtained using the ``--list-sizes`` option for the ``salt-cloud`` Sizes can be obtained using the ``--list-sizes`` option for the ``salt-cloud``
command: command:
@ -64,22 +64,30 @@ command:
---------- ----------
joyent: joyent:
---------- ----------
Extra Small 512 MB: g4-highcpu-512M:
---------- ----------
default: default:
false False
description:
Compute Optimized 512M RAM - 1 vCPU - 10 GB Disk
disk: disk:
15360 10240
group:
Compute Optimized
id: id:
Extra Small 512 MB 14aea8fc-d0f8-11e5-bfe4-a7458dbc6c99
lwps:
4000
memory: memory:
512 512
name: name:
Extra Small 512 MB g4-highcpu-512M
swap: swap:
1024 2048
vcpus: vcpus:
1 0
version:
1.0.3
...SNIP... ...SNIP...
Images can be obtained using the ``--list-images`` option for the ``salt-cloud`` Images can be obtained using the ``--list-images`` option for the ``salt-cloud``
@ -96,26 +104,40 @@ command:
---------- ----------
description: description:
A 32-bit SmartOS image with just essential packages A 32-bit SmartOS image with just essential packages
installed. Ideal for users who are comfortable with setting installed. Ideal for users who are comfortabl e with
up their own environment and tools. setting up their own environment and tools.
disabled:
False
files: files:
---------- |_
- compression: ----------
bzip2 compression:
- sha1: gzip
40cdc6457c237cf6306103c74b5f45f5bf2d9bbe sha1:
- size: b00a77408ddd9aeac85085b68b1cd22a07353956
82492182 size:
106918297
homepage:
http://wiki.joyent.com/jpc2/Base+Instance
id:
00aec452-6e81-11e4-8474-ebfec9a1a911
name: name:
base base
os: os:
smartos smartos
owner: owner:
352971aa-31ba-496c-9ade-a379feaecd52 9dce1460-0c4c-4417-ab8b-25ca478c5a78
public: public:
True True
published_at:
2014-11-17T17:41:46Z
requirements:
----------
state:
active
type:
smartmachine
version:
14.3.0
...SNIP... ...SNIP...

4
doc/topics/cloud/profiles.rst
View File

@ -107,5 +107,5 @@ Larger Example
cent_joyent: cent_joyent:
provider: my-joyent-config provider: my-joyent-config
image: centos-6 image: centos-7
size: Small 1GB size: g4-highram-16G

4
salt/cloud/clouds/joyent.py
View File

@ -19,7 +19,7 @@ Set up the cloud configuration at ``/etc/salt/cloud.providers`` or
# The location of the ssh private key that can log into the new VM # The location of the ssh private key that can log into the new VM
private_key: /root/mykey.pem private_key: /root/mykey.pem
# The name of the private key # The name of the private key
private_key: mykey keyname: mykey
When creating your profiles for the joyent cloud, add the location attribute to When creating your profiles for the joyent cloud, add the location attribute to
the profile, this will automatically get picked up when performing tasks the profile, this will automatically get picked up when performing tasks
@ -29,7 +29,7 @@ associated with that vm. An example profile might look like:
joyent_512: joyent_512:
provider: my-joyent-config provider: my-joyent-config
size: Extra Small 512 MB size: g4-highcpu-512M
image: centos-6 image: centos-6
location: us-east-1 location: us-east-1

4
tests/integration/files/conf/cloud.profiles.d/joyent.conf
View File

@ -1,6 +1,6 @@
joyent-test: joyent-test:
provider: joyent-config provider: joyent-config
size: Extra Small 512 MB size: g4-highcpu-512M
image: ubuntu-certified-14.04 image: ubuntu-certified-16.10
location: us-east-1 location: us-east-1
script_args: '-P -Z' script_args: '-P -Z'