update for OSP single subnet; ansible 2.4

Author: christopherkeller

provision-solr.yml

@@ -63,7 +63,7 @@
         when: num_solr_nodes | int == 0 and cloud == 'aws'
       - include_role:
           name: 'osp'
-        when: num_solr_nodes == 0 and cloud == 'osp'
+        when: num_solr_nodes | int == 0 and cloud == 'osp'
       when: cloud is defined and (cloud == 'aws' or cloud == 'osp')
 
 # If we're dynamically provisioning, then do some final configuration on the

roles/aws/tasks/main.yml

@@ -20,7 +20,7 @@
 - set_fact:
     application_roles: "{{((roles_list | length) == (node_map_entries | length)) | ternary(roles_list, roles_list + ['none'])}}"
 # Launch AMIs if they aren't already running
-- ec2_remote_facts:
+- ec2_instance_facts:
     region: "{{region}}"
     filters:
       instance-state-name: running
@@ -49,5 +49,5 @@
   when: internal_subnet is undefined
 # if we didn't find any matching instances that are running, then
 # launch a set of VMs with those tags
-- include: launch-amis.yml static=no
+- include_tasks: launch-amis.yml
   when: not matching_instances_found

roles/build-app-host-groups/files/build_aws_host_groups.yml

@@ -9,9 +9,9 @@
     node_list_name: "{{(hg_item_role == 'none') | ternary((hg_item_name + '_nodes'), (hg_item_name + '_' + hg_item_role + '_nodes'))}}"
     app_group_name: "{{(hg_item_role == 'none') | ternary(hg_item_name,(hg_item_name + '_' + hg_item_role))}}"
 # then, gather the facts that are used to create our host group from the
-# `ec2_remote_facts` module
+# `ec2_instance_facts` module
 - name: Gather facts for the hosts that match our filter
-  ec2_remote_facts:
+  ec2_instance_facts:
     region: "{{region}}"
     filters:
       instance-state-name: running

roles/build-app-host-groups/files/build_osp_host_groups.yml

@@ -29,17 +29,24 @@
 # containing that list and create the appropriately named host groups
 - set_fact:
     "{{node_list_name}}": "{{app_nodes}}"
+
 - name: Create {{app_group_name}} host group from OpenStack meta-data
   add_host:
     name: "{{item}}"
     groups: "{{app_group_name}},{{node_list_name}}"
-    ansible_ssh_host: "{{(os_inventory_json | json_query('_meta.hostvars.\"' + item + '\".openstack.addresses.private[].addr') | list).0}}"
+    ansible_host: "{{ (os_inventory_json | json_query('_meta.hostvars.\"' + item + '\".openstack.addresses.private[1].addr')) }}"
     ansible_ssh_private_key_file: "{{private_key_path}}/{{region}}-{{project}}-{{hg_item_name}}-{{domain}}-private-key.pem"
   with_items: "{{app_nodes | default([])}}"
-# finally, add the floating IP addresses for nodes in this application group to
-# the `osp_floating_ip` list (this fact currently is not used, but it was used
-# in the past so we still build it)
-- name: Add floating IP addresses to osp_floating_ip for the {{app_group_name}} nodes
-  set_fact:
-    osp_floating_ip: "{{(osp_floating_ip | default({})) | combine({item: (os_inventory_json | json_query('_meta.hostvars.\"' + item + '\".openstack.addresses.public') | selectattr('OS-EXT-IPS:type', 'equalto', 'floating') | map(attribute='addr') | list).0})}}"
+  when:
+    - internal_uuid == external_uuid
+
+# multiple subnet hostgroups already have the correct ansible_host
+- name: Create {{app_group_name}} host group from OpenStack meta-data
+  add_host:
+    name: "{{item}}"
+    groups: "{{app_group_name}},{{node_list_name}}"
+    ansible_host: "{{(os_inventory_json | json_query('_meta.hostvars.\"' + item + '\".openstack.addresses.private[].addr') | list).0}}"
+    ansible_ssh_private_key_file: "{{private_key_path}}/{{region}}-{{project}}-{{hg_item_name}}-{{domain}}-private-key.pem"
   with_items: "{{app_nodes | default([])}}"
+  when:
+    - internal_uuid != external_uuid

roles/build-app-host-groups/tasks/main.yml

@@ -22,14 +22,14 @@
       cluster_nodes: "{{(os_inventory_json | json_query('[\"meta-Cluster_' + (cluster | default('a')) + '\"]')).0}}"
   # and, finally, loop through the host_group_list, building each host group
   # (in turn) from the lists of nodes we just constructed
-  - include: ../files/build_osp_host_groups.yml
+  - include_tasks: ../files/build_osp_host_groups.yml
     with_items: "{{host_group_list}}"
     loop_control:
       loop_var: host_group_item
   when: cloud == "osp"
 # If we're building a cluster in an AWS environtment, then loop through the
 # host_group_list, building each host group (in turn)
-- include: ../files/build_aws_host_groups.yml
+- include_tasks: ../files/build_aws_host_groups.yml
   with_items: "{{host_group_list}}"
   loop_control:
     loop_var: host_group_item

roles/build-app-host-groups/utils/openstack.py

@@ -120,7 +120,7 @@ def get_host_groups(inventory, refresh=False):
 
 def append_hostvars(hostvars, groups, key, server, namegroup=False):
     hostvars[key] = dict(
-        ansible_ssh_host=server['interface_ip'],
+        ansible_host=server['interface_ip'],
         openstack=server)
     for group in get_groups_from_server(server, namegroup=namegroup):
         groups[group].append(key)

roles/configure-solr-nodes/tasks/main.yml

@@ -1,3 +1,3 @@
 # (c) 2017 DataNexus Inc.  All Rights Reserved
 ---
-- include: setup-solr-server-properties.yml static=no
+- include_tasks: setup-solr-server-properties.yml

roles/configure-solr-nodes/tasks/setup-solr-server-properties.yml

@@ -129,7 +129,7 @@
   when: not (solr_data_dir is undefined or solr_data_dir is none or solr_data_dir | trim == '')
 # loop through the items in our list and, if they don't exist in the new
 # data directory, move them over there
-- include: move-files.yml
+- include_tasks: move-files.yml
   with_items: "{{(dir_list.files + file_list.files) | map(attribute='path') | list}}"
   when: not (solr_data_dir is undefined or solr_data_dir is none or solr_data_dir | trim == '')
 ## and finally, now that the contents are moved, remove the default

roles/initialize-play/tasks/main.yml

@@ -50,16 +50,14 @@
 # description values, while the value that type is set to will depend on the
 # 'type' in each of those values; currently either 'cidr' or 'name' values
 # are supported for the 'type' field)
-- include: "{{role_path}}/files/get_iface_name.yml"
-  static: no
+- include_tasks: "{{role_path}}/files/get_iface_name.yml"
   with_items: "{{iface_description_array}}"
   loop_control:
     loop_var: iface_description
   when: not (iface_description_array is undefined)
 # finally, get values for the addresses of the `data_iface` and `api_iface`
 # (if defined)
-- include: "{{role_path}}/files/get_iface_addr.yml"
-  static: no
+- include_tasks: "{{role_path}}/files/get_iface_addr.yml"
   vars:
     iface_name: "{{data_iface}}"
     as_fact: "data_addr"
@@ -70,8 +68,7 @@
 - set_fact:
     api_iface: "{{(lcl_iface_names | reject('equalto', 'lo') | reject('equalto', data_iface) | list).0}}"
   when: api_iface == ''
-- include: "{{role_path}}/files/get_iface_addr.yml"
-  static: no
+- include_tasks: "{{role_path}}/files/get_iface_addr.yml"
   vars:
     iface_name: "{{api_iface}}"
     as_fact: "api_addr"

roles/osp/tasks/launch-vms.yml

@@ -133,9 +133,9 @@
 # few tasks
 - set_fact:
     node_role_list: []
-    nic_list: "{{(external_uuid is defined) | ternary([{'net-id': internal_uuid}, {'net-id': external_uuid}], [{'net-id': internal_uuid}])}}"
+    nic_list: "{{ (internal_uuid != external_uuid) | ternary([{ 'net-id': internal_uuid }, { 'net-id': external_uuid }], [{ 'net-id': external_uuid }]) }}"
 - name: Build up a list of roles (per node being created)
-  include: build-role-list.yml static=no
+  include_tasks: build-role-list.yml
   with_items: "{{node_map | selectattr('application', 'equalto', application) | list}}"
   loop_control:
     loop_var: node_map_entry
@@ -149,68 +149,121 @@
     display_name: "{{project}}_{{application}}_{{node_role_list[item | int]}}_{{cluster | default('a')}}_{{item}}"
   with_sequence: start=0 end="{{(node_role_list | length) - 1}}"
   when: data_volume is defined
-# openstack instance names must be unique, so we need to add a sequence number to each name
-- name: Launch instances
-  os_server:
-    state: present
-    cloud: "{{tenant}}"
-    name: "{{cloud}}_{{tenant}}_{{project}}_{{dataflow | default('none')}}_{{application}}_{{domain}}_{{cluster | default('a')}}_{{item}}"
-    meta:
-      Name: "{{cloud}}_{{tenant}}_{{project}}_{{dataflow | default('none')}}_{{application}}_{{domain}}_{{cluster | default('a')}}"
-      Tenant: "{{tenant}}"
-      Project: "{{project}}"
-      Cloud: "{{cloud}}"
-      Domain: "{{domain}}"
-      Application: "{{application}}"
-      Cluster: "{{cluster | default('a')}}"
-      Role: "{{node_role_list[item | int]}}"
-      Dataflow: "{{dataflow | default('none')}}"
-    region_name: "{{region}}"
-    availability_zone: "{{zone}}"
-    image: "{{image}}"
-    key_name: "{{keypair.key.name}}"
-    timeout: 200
-    auto_ip: yes
-    reuse_ips: true
-    flavor: "{{type}}"
-    nics: "{{nic_list}}"
-    security_groups: "{{sg_names_str}}"
-    volumes: "{{project}}_{{application}}_{{node_role_list[item | int]}}_{{cluster | default('a')}}_{{item}}"
-  register: osp_out
-  with_sequence: start=0 end="{{(node_role_list | length) - 1}}"
-# setup a floating IP address for each instance from the float_pool
-- name: assigning floating IPs to instances
-  os_floating_ip:
-    state: present
-    reuse: true
-    cloud: "{{tenant}}"
-    server: "{{item.server.id}}"
-    fixed_address: "{{item.server.addresses.public.0['addr']}}"
-    network: "{{float_pool}}"
-    nat_destination: "{{external_uuid}}"
-  with_items: "{{osp_out.results}}"
-  register:
-  when: not osp_out | skipped and osp_out.changed and osp_out.results | length > 0
-# construct the `app_group_name_list` and `node_list_name_list` lists from the
-# `application_roles` list
+
+# construct the `app_group_name_list` and `node_list_name_list` lists from the `application_roles` list
 - set_fact:
     node_list_name_list: "{{(node_list_name_list | default([])) + [((item == 'none') | ternary((application + '_nodes'), (application + '_' + item + '_nodes')))]}}"
     app_group_name_list: "{{(app_group_name_list | default([])) + [((item == 'none') | ternary(application, application + '_' + item))]}}"
   with_items: "{{node_role_list}}"
-# add the instances created to the corresponding application host group
-- name: Add new instances to the appropriate host groups
-  add_host:
-    name: "{{item.1.server.addresses.private.0['addr']}}"
-    groups: "{{app_group_name_list[item.0 | int]}},{{node_list_name_list[item.0 | int]}}"
-    ansible_ssh_host: "{{item.1.server.addresses.private.0['addr']}}"
-    ansible_ssh_private_key_file: "{{private_keyfile_path}}"
-  with_indexed_items: "{{osp_out.results}}"
+
+# this handles single subnet, eg, when internal and external uuids are identical
+# openstack instance names must be unique, so we need to add a sequence number to each name
+- block:
+  - name: Launch single subnet instances
+    os_server:
+      state: present
+      cloud: "{{tenant}}"
+      name: "{{cloud}}_{{tenant}}_{{project}}_{{dataflow | default('none')}}_{{application}}_{{domain}}_{{cluster | default('a')}}_{{item}}"
+      meta:
+        Name: "{{cloud}}_{{tenant}}_{{project}}_{{dataflow | default('none')}}_{{application}}_{{domain}}_{{cluster | default('a')}}"
+        Tenant: "{{tenant}}"
+        Project: "{{project}}"
+        Cloud: "{{cloud}}"
+        Domain: "{{domain}}"
+        Application: "{{application}}"
+        Cluster: "{{cluster | default('a')}}"
+        Role: "{{node_role_list[item | int]}}"
+        Dataflow: "{{dataflow | default('none')}}"
+      region_name: "{{region}}"
+      availability_zone: "{{zone}}"
+      image: "{{image}}"
+      key_name: "{{keypair.key.name}}"
+      timeout: 200
+      floating_ip_pools: "{{ float_pool }}"
+      reuse_ips: true
+      flavor: "{{type}}"
+      nics: "{{nic_list}}"
+      security_groups: "{{sg_names_str}}"
+      volumes: "{{project}}_{{application}}_{{node_role_list[item | int]}}_{{cluster | default('a')}}_{{item}}"
+    register: osp_single
+    with_sequence: start=0 end="{{(node_role_list | length) - 1}}"
+
+  - name: Add new instances to the appropriate host groups
+    add_host:
+      name: "{{item[1].server.addresses.private.0['addr']}}"
+      groups: "{{app_group_name_list[item.0 | int]}},{{node_list_name_list[item.0 | int]}}"
+      ansible_host: "{{item[1].server.addresses.private.1['addr']}}"
+      ansible_ssh_private_key_file: "{{private_keyfile_path}}"
+    with_indexed_items: "{{osp_single.results}}"
+  when:
+    - internal_uuid == external_uuid
+
+# this handles multiple subnets
+# openstack instance names must be unique, so we need to add a sequence number to each name
+- block:
+  - name: Launch multiple subnet instances
+    os_server:
+      state: present
+      cloud: "{{tenant}}"
+      name: "{{cloud}}_{{tenant}}_{{project}}_{{dataflow | default('none')}}_{{application}}_{{domain}}_{{cluster | default('a')}}_{{item}}"
+      meta:
+        Name: "{{cloud}}_{{tenant}}_{{project}}_{{dataflow | default('none')}}_{{application}}_{{domain}}_{{cluster | default('a')}}"
+        Tenant: "{{tenant}}"
+        Project: "{{project}}"
+        Cloud: "{{cloud}}"
+        Domain: "{{domain}}"
+        Application: "{{application}}"
+        Cluster: "{{cluster | default('a')}}"
+        Role: "{{node_role_list[item | int]}}"
+        Dataflow: "{{dataflow | default('none')}}"
+      region_name: "{{region}}"
+      availability_zone: "{{zone}}"
+      image: "{{image}}"
+      key_name: "{{keypair.key.name}}"
+      timeout: 200
+      auto_ip: yes
+      reuse_ips: true
+      flavor: "{{type}}"
+      nics: "{{nic_list}}"
+      security_groups: "{{sg_names_str}}"
+      volumes: "{{project}}_{{application}}_{{node_role_list[item | int]}}_{{cluster | default('a')}}_{{item}}"
+    register: osp_multiple
+    with_sequence: start=0 end="{{(node_role_list | length) - 1}}"
+  # setup a floating IP address for each instance from the float_pool
+  - name: assigning floating IPs to instances
+    os_floating_ip:
+      state: present
+      reuse: true
+      cloud: "{{tenant}}"
+      server: "{{item.server.id}}"
+      fixed_address: "{{item.server.addresses.public.0['addr']}}"
+      network: "{{float_pool}}"
+      nat_destination: "{{external_uuid}}"
+    with_items: "{{osp_multiple.results}}"
+    register:
+    when: not osp_multiple | skipped and osp_multiple.changed and osp_multiple.results | length > 0
+
+  # add the instances created to the corresponding application host group
+  - name: Add new instances to the appropriate host groups
+    add_host:
+      name: "{{item.1.server.addresses.private.0['addr']}}"
+      groups: "{{app_group_name_list[item.0 | int]}},{{node_list_name_list[item.0 | int]}}"
+      ansible_host: "{{item.1.server.addresses.private.0['addr']}}"
+      ansible_ssh_private_key_file: "{{private_keyfile_path}}"
+    with_indexed_items: "{{osp_multiple.results}}"
+  when:
+    - internal_uuid != external_uuid
+
+# sigh @ ansible for making me do this
+- set_fact:
+    osp: "{{ (internal_uuid == external_uuid) | ternary(osp_single, osp_multiple) }}"
+
 # wait_for doesn't work with a proxy, so we need to ssh and check output
 - name: Wait for instances to be accessible via SSH
-  shell: /bin/sleep 10 && /usr/bin/ssh -i "{{private_keyfile_path}}" "{{user}}@{{item.server.addresses.private.0['addr']}}" echo DataNexus
+  shell: /bin/sleep 20 && /usr/bin/ssh -i "{{ private_keyfile_path }}" "{{ user }}@{{ hostvars[item.server.addresses.private.0['addr']].ansible_host }}" echo DataNexus  
   register: output
-  retries: 24
-  delay: 15
+  retries: 4
+  delay: 10
   until: output.stdout.find('DataNexus') != -1
-  with_items: "{{osp_out.results}}"
-  when: not osp_out | skipped and osp_out.changed and osp_out.results | length > 0
+  with_items: "{{osp.results}}"
+  when: not osp | skipped and osp.changed and osp.results | length > 0

roles/osp/tasks/main.yml

@@ -19,6 +19,11 @@
 # should be added to the `roles_list` we just constructed, above)
 - set_fact:
     application_roles: "{{((roles_list | length) == (node_map_entries | length)) | ternary(roles_list, roles_list + ['none'])}}"
+
+# set the list of nodes for this application
+- set_fact:
+    application_nodes: "{{(os_inventory_json | json_query('[\"meta-Application_' + application + '\"]')).0}}"
+
 # and build a list of the instances that match the input roles from the
 # matching `node_map` entries
 - set_fact:
@@ -29,6 +34,7 @@
 # that are used when launching instances (below) if no matching nodes are found
 - set_fact:
     matching_instances: "{{cloud_nodes | intersect(tenant_nodes) | intersect(project_nodes) | intersect(dataflow_nodes) | intersect(domain_nodes) | intersect(application_nodes) | intersect(cluster_nodes) | intersect(role_nodes)}}"
+
 - set_fact:
     matching_instances_found: "{{not (matching_instances | length) == 0}}"
     root_volume_default: "{{(data_volume is defined) | ternary(11, 40)}}"
@@ -38,5 +44,5 @@
   when: internal_subnet is undefined
 # if we didn't find any matching instances, then launch a set of VMs that are
 # tagged with the input tags
-- include: launch-vms.yml static=no
+- include_tasks: launch-vms.yml
   when: not matching_instances_found