Skip to content

Commit

Permalink
Merge branch 'release-1.1.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
bmh2git committed Dec 4, 2015
2 parents 3d35404 + da8ff8d commit b997b89
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions build.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

# define project level attributes:
name = 'clc-ansible-module'
version = '1.1.1'
version = '1.1.2'
summary = "Centurylink Cloud Ansible Modules"
description = "Ansible extension modules which allow users to interact with Centurylink Cloud to define and manage cloud components."
authors = [Author ("CenturyLink Cloud", "[email protected]")]
Expand All @@ -55,7 +55,7 @@ def initialize( project ):
project.get_property('filter_resources_glob').append('**/clc_ansible_module/*.py')
# ----------------
# install clc-sdk during installation
project.depends_on("clc-sdk", "==2.29")
project.depends_on("clc-sdk", "==2.37")
# ----------------
# execute some installation scripts
project.set_property('dir_source_main_scripts', 'src/main/python')
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.ctlts</groupId>
<artifactId>clc-ansible-module</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
<name>clc-ansible-module</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
4 changes: 2 additions & 2 deletions src/main/python/clc_inv.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ def print_inventory_json():
groups = _find_all_groups()
servers = _get_servers_from_groups(groups)
hostvars = _find_all_hostvars_for_servers(servers)
# dynamic_groups = _build_hostvars_dynamic_groups(hostvars)
# groups.update(dynamic_groups)
dynamic_groups = _build_hostvars_dynamic_groups(hostvars)
groups.update(dynamic_groups)

result = groups
result['_meta'] = hostvars
Expand Down

0 comments on commit b997b89

Please sign in to comment.