Browse Source

Merge pull request #9681 from mazzystr/awsasglcname

Change aws launch_config & autoscale group name
OpenShift Merge Robot 6 years ago
parent
commit
cc946859c0

+ 0 - 4
roles/openshift_aws/tasks/build_node_group.yml

@@ -22,10 +22,6 @@
     - "'results' in amiout"
     - amiout.results|length > 0
 
-# Need to set epoch time in one place to use for launch_config and scale_group
-- set_fact:
-    l_epoch_time: "{{ ansible_date_time.epoch }}"
-#
 # query asg's and determine if we need to create the others.
 # if we find more than 1 for each type, and this isn't an upgrade, then exit
 - name: query all asg's for this cluster

+ 1 - 1
roles/openshift_aws/tasks/launch_config.yml

@@ -16,7 +16,7 @@
 # Create the scale group config
 - name: Create the node scale group launch config
   ec2_lc:
-    name: "{{ openshift_aws_node_group.name }}-{{ openshift_aws_ami_map[openshift_aws_node_group.group] | default(openshift_aws_ami) }}-{{ l_epoch_time }}"
+    name: "{{ openshift_aws_node_group.name }}-{{ openshift_aws_ami_map[openshift_aws_node_group.group] | default(openshift_aws_ami) }}-{{ l_deployment_serial }}"
     region: "{{ openshift_aws_region }}"
     image_id: "{{ openshift_aws_ami_map[openshift_aws_node_group.group] | default(openshift_aws_ami) }}"
     instance_type: "{{ l_node_group_config[openshift_aws_node_group.group].instance_type }}"