Skip to content

Commit

Permalink
Update modules for Ansible 2.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
wied03 committed Oct 12, 2016
1 parent 9e85ee8 commit 1d2b99b
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class Docker_image < Base
attribute :dockerfile
validates :dockerfile, type: String

# @return [Boolean, nil] Use with absent state to un-tag and remove all images matching the specified name. Use with states 'present' and 'tagged' to take action even when an image already exists.
# @return [Boolean, nil] Use with state I(absent) to un-tag and remove all images matching the specified name. Use with state C(present) to build, load or pull an image when the image already exists.
attribute :force
validates :force, inclusion: {:in=>[true, false], :message=>"%{value} needs to be true, false"}, allow_nil: true

Expand Down Expand Up @@ -45,9 +45,9 @@ class Docker_image < Base
attribute :repository
validates :repository, type: String

# @return [:absent, :present, :"build (DEPRECATED)", nil] Make assertions about the state of an image.,When 'absent' an image will be removed. Use the force option to un-tag and remove all images matching the provided name.,When 'present' check if an image exists using the provided name and tag. If the image is not found or the force option is used, the image will either be pulled, built or loaded. By default the image will be pulled from Docker Hub. To build the image, provide a path value set to a directory containing a context and Dockerfile. To load an image, specify load_path to provide a path to an archive file. To tag an image to a repository, provide a repository path. If the name contains a repository path, it will be pushed.,NOTE: 'build' is DEPRECATED. Specifying 'build' will behave the same as 'present'.
# @return [:absent, :present, :build, nil] Make assertions about the state of an image.,When 'absent' an image will be removed. Use the force option to un-tag and remove all images matching the provided name.,When 'present' check if an image exists using the provided name and tag. If the image is not found or the force option is used, the image will either be pulled, built or loaded. By default the image will be pulled from Docker Hub. To build the image, provide a path value set to a directory containing a context and Dockerfile. To load an image, specify load_path to provide a path to an archive file. To tag an image to a repository, provide a repository path. If the name contains a repository path, it will be pushed.,NOTE: C(build) is DEPRECATED and will be removed in release 2.3. Specifying C(build) will behave the same as C(present).
attribute :state
validates :state, inclusion: {:in=>[:absent, :present, :"build (DEPRECATED)"], :message=>"%{value} needs to be :absent, :present, :\"build (DEPRECATED)\""}, allow_nil: true
validates :state, inclusion: {:in=>[:absent, :present, :build], :message=>"%{value} needs to be :absent, :present, :build"}, allow_nil: true

# @return [String, nil] Used to select an image when pulling. Will be added to the image when pushing, tagging or building. Defaults to 'latest' when pulling an image.
attribute :tag
Expand Down
4 changes: 2 additions & 2 deletions lib/ansible/ruby/modules/generated/core/files/synchronize.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ class Synchronize < Base
attribute :dest
validates :dest, presence: true

# @return [Integer, nil] Port number for ssh on the destination host. Prior to ansible 2.0, the ansible_ssh_port inventory var took precedence over this value.
# @return [Array<String>, String, nil] Port number for ssh on the destination host. Prior to ansible 2.0, the ansible_ssh_port inventory var took precedence over this value.
attribute :dest_port
validates :dest_port, type: Integer
validates :dest_port, type: TypeGeneric.new(String)

# @return [:push, :pull, nil] Specify the direction of the synchronization. In push mode the localhost or delegate is the source; In pull mode the remote host in context is the source.
attribute :mode
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ module Ansible
module Ruby
module Modules
class Nxos_feature < Base
# @return [String] Name of feature
# @return [String] Name of feature.
attribute :feature
validates :feature, presence: true, type: String

# @return [:enabled, :disabled, nil] Desired state of the feature
# @return [:enabled, :disabled, nil] Desired state of the feature.
attribute :state
validates :state, inclusion: {:in=>[:enabled, :disabled], :message=>"%{value} needs to be :enabled, :disabled"}, allow_nil: true
end
Expand Down
6 changes: 3 additions & 3 deletions util/checksums_existing.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"digital_ocean_sshkey.rb": "li7juSEew5m1RIZT944JZq3QJmsGmVYtvV1jHS544vw=",
"docker.rb": "LPup1AWdgnKyK/AhL9ybuMrbVjaD/zsiweBGcJMbEG4=",
"docker_container.rb": "Af01G5O8Tl/cM90txscBmpg96g/NQwZoWXIeYOPUx2I=",
"docker_image.rb": "InHBZeKdeqfcIniwmguqMSbrVPYDkStAEHhZQyzZzTg=",
"docker_image.rb": "zvovKzrVziuxI5gZmwf1euTzb41NN6PMJutPYTeMa3w=",
"docker_image_facts.rb": "0DKj49TUMudM+8S9gm/YbyvKaI3XSC50reUt/Jtzz1Y=",
"docker_login.rb": "zW88ToeRUjeNdJHp/4lOHzkA4yTDv4qSsR46FaNt1BE=",
"docker_service.rb": "jbq4UhLO7fgYnEAVvIBgymp45TJ+XyydH2NL5CYSRXs=",
Expand Down Expand Up @@ -138,7 +138,7 @@
"lineinfile.rb": "0of96aMtU1VGzE92RMkGKFJjWWMhL1pKrED8AkBSJ+s=",
"replace.rb": "MjoOxl+Al/y0bOp7lnkQ45o2uq9jhX+NHZrMHz4AqxI=",
"stat.rb": "8jMnTF348hw5HmYGVoQr5USfiGv0+hfCTEcCT0qPhGo=",
"synchronize.rb": "jEjGmjhDh3YLVYpKIdnSWpvoaUoTyhcg9u9IQgBONEA=",
"synchronize.rb": "1g5CR+YHSrHn80Dmt6a6Btnq6M2z1EexTm0m0DlCUr0=",
"template.rb": "DFMTXp+rNT7R33JPNSYUQx0pSCPhxffaGyK6kbibWgw=",
"unarchive.rb": "45KprzghwwfNFS+1RWsBYAlPpvl/i7cNyDms8crYIU8=",
"xattr.rb": "StZqSomNxp8RNcVsLnxSUy2bC/ok0CLSMZR3lTKdehw=",
Expand Down Expand Up @@ -173,7 +173,7 @@
"nxos_command.rb": "Ig5+vQcm6EZDOwxkcG/Ttj1W5FZjJWO9z9cwhG35Fj8=",
"nxos_config.rb": "KAOioY6ktLUqC5GwaHi7L3+P9Hzus9HDxiq5vOZrWHE=",
"nxos_facts.rb": "e/HaCsBCcuFeOEoQCALEJVsILTzsaigIU/R1NVPoQZg=",
"nxos_feature.rb": "zEXIDrWQ+uYT/0AWXFCL0PHiPYMg1FlOxYDMT2aDhgs=",
"nxos_feature.rb": "xCY985MeP7gx9CJ+VYOUbtVbYbJlH+B+QQvE1d70MjI=",
"nxos_interface.rb": "DEyeZxbI2vlTOA5cIzIw64kz4KO2L789DNFw0FpQ8c0=",
"nxos_ip_interface.rb": "qBcCAD/yFypdvxKQwbfQPguvJJ6bVXll4TrI4XYJJGE=",
"nxos_nxapi.rb": "v4+GhSw07xlIT3xmrmivl6nF0E4qC0PklBwwrPAMuDg=",
Expand Down

0 comments on commit 1d2b99b

Please sign in to comment.