Merge branch 'master' into group-resources-wip

Author: Bharat Kunwar

README.md

@@ -92,6 +92,11 @@ that is generated.  This parameter is a list of dicts of the form:
 to be defined for that group. The group variables for each group are defined as
 a dictionary mapping variable names to their values.
 
+`cluster_environment_group`: An optional Ansible group name to which all
+cluster hosts and localhost will be added. This can be useful if there is a
+single group that represents an environment such as
+development/staging/production.
+
 Dependencies
 ------------
 

defaults/main.yml

@@ -14,5 +14,6 @@ cluster_template: "{{ role_path }}/files/resources/cluster-infra.yaml"
 cluster_params: {}
 cluster_roles: []
 cluster_group_vars: {}
-cluster_inventory: "{{ playbook_dir }}/inventory_{{ cluster_name }}"
+cluster_inventory: "{{ playbook_dir }}/inventory-{{ cluster_name }}"
 cluster_ssh_timeout: 600
+cluster_environment_group:

meta/main.yml

@@ -1,5 +1,6 @@
 ---
 galaxy_info:
+  #role_name: cluster_infra
   author: Stig Telfer
   description: >
     This role generates software-defined OpenStack infrastructure that can

tasks/main.yml

@@ -11,9 +11,6 @@
 
 # Case 1: we are modifying the cluster.
 - block:
-    - debug:
-        var: cluster_params
-
     - name: Orchestrate OpenStack infrastructure
       register: cluster_stack
       os_stack:

templates/cluster_inventory.j2

@@ -2,23 +2,29 @@
 [openstack]
 localhost ansible_connection=local ansible_python_interpreter=python
 
+{% if cluster_environment_group is not none %}
+[{{ cluster_environment_group }}:children]
+openstack
+cluster
+{% endif %}
+
 [cluster:children]
 {% for group_data in cluster_group.output_value %}
 {{ cluster_name }}_{{ group_data.group }}
 {% endfor %}
 
 {% for group_data in cluster_group.output_value %}
-[{{ cluster_name}}_{{ group_data.group }}]
+[{{ cluster_name }}_{{ group_data.group }}]
 {% for node_data in group_data.nodes %}
-{{node_data.name}} ansible_host={{ node_data.ip }} ansible_user={{ cluster_groups | selectattr("name", "equalto", group_data.group) | map(attribute='user') | join }}
+{{ node_data.name }} ansible_host={{ node_data.ip }} ansible_user={{ cluster_params.cluster_groups | selectattr("name", "equalto", group_data.group) | map(attribute='user') | join }}
 {% endfor %}
 
 {% endfor %}
 # Specific roles for cluster deployment assignments
 {% for role in cluster_roles %}
 [cluster_{{ role.name }}:children]
 {% for group in role.groups %}
-{{ cluster_name}}_{{ group.name }}
+{{ cluster_name }}_{{ group.name }}
 {% endfor %}
 
 {% endfor %}