[GITHUB-21] Fixes tag assigned id

sansible · May 10, 2018 · 39548b1 · 39548b1
1 parent 90c19dc
commit 39548b1
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -49,17 +49,16 @@ maintained across a dynamic set of instances in an ASG.
 
 ```YAML
 - role: sansible.kafka
-  kafka:
-    sansible_kafka_aws_cluster_autodiscover_enabled: yes
-    sansible_kafka_aws_cluster_autodiscover_hosts:
-      - 01.kafka.io.internal
-      - 02.kafka.io.internal
-      - 03.kafka.io.internal
-    sansible_kafka_aws_cluster_autodiscover_lookup_filter: "Name=tag:Environment,Values=dev Name=tag:Role,Values=kafka"
-    sansible_kafka_aws_cluster_autodiscover_r53_zone_id: xxxxxxxx
-    # A ZK cluster behind an ELB
-    sansible_kafka_zookeeper_hosts:
-      - zookeeper.app.internal
+  sansible_kafka_aws_cluster_autodiscover_enabled: yes
+  sansible_kafka_aws_cluster_autodiscover_hosts:
+    - 01.kafka.io.internal
+    - 02.kafka.io.internal
+    - 03.kafka.io.internal
+  sansible_kafka_aws_cluster_autodiscover_lookup_filter: "Name=tag:Environment,Values=dev Name=tag:Role,Values=kafka"
+  sansible_kafka_aws_cluster_autodiscover_r53_zone_id: xxxxxxxx
+  # A ZK cluster behind an ELB
+  sansible_kafka_zookeeper_hosts:
+    - zookeeper.app.internal
 ```
 
 #### AWS Tag Discovery
@@ -72,12 +71,11 @@ this behaviour and specify the tag to lookup like so:
 
 ```YAML
 - role: sansible.kafka
-  kafka:
-    sansible_kafka_aws_cluster_assigned_id_enabled: yes
-    sansible_kafka_aws_cluster_autodiscover_id_tag_name: instanceindex
-    # A ZK cluster behind an ELB
-    sansible_kafka_zookeeper_hosts:
-      - zookeeper.app.internal
+  sansible_kafka_aws_cluster_assigned_id_enabled: yes
+  sansible_kafka_aws_cluster_assigned_id_tag_name: instanceindex
+  # A ZK cluster behind an ELB
+  sansible_kafka_zookeeper_hosts:
+    - zookeeper.app.internal
 ```
 
 

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -3,6 +3,7 @@
 sansible_kafka_apache_mirror: https://archive.apache.org/dist/
 sansible_kafka_auto_create_topics: "false"
 sansible_kafka_aws_cluster_assigned_id_enabled: no
+sansible_kafka_aws_cluster_assigned_id_tag_name: instanceindex
 # If enabled AWS will be used to figure out which host and id should be used
 # Note that you must install the AWS CLI tools to use this feature
 sansible_kafka_aws_cluster_autodiscover_enabled: no
@@ -11,7 +12,6 @@ sansible_kafka_aws_cluster_autodiscover_id_tag_name: KafkaID
 sansible_kafka_aws_cluster_autodiscover_lookup_filter: "Name=tag:Environment,Values=dev Name=tag:Role,Values=kafka"
 sansible_kafka_aws_cluster_autodiscover_r53_zone_id: ~
 sansible_kafka_aws_delay: 5
-sansible_kafka_aws_id_tag_name: instanceindex
 sansible_kafka_aws_retries: 3
 sansible_kafka_conf_dir: /home/kafka/etc
 sansible_kafka_controlled_shutdown_enable: true

diff --git a/tasks/configure.yml b/tasks/configure.yml
@@ -93,9 +93,7 @@
 
 - name: Assigned ID set Broker ID
   set_fact:
-    kafka: "{{ kafka | combine( {
-        'id': assigned_id_instance_tags.tags[sansible_kafka_aws_cluster_autodiscover_id_tag_name]
-      }, recursive=True) }}"
+    sansible_kafka_aws_cluster_assigned_id: "{{ assigned_id_instance_tags.tags[sansible_kafka_aws_cluster_assigned_id_tag_name] }}"
   when: ansible_ec2_instance_id is defined
     and sansible_kafka_aws_cluster_assigned_id_enabled
 

diff --git a/templates/server.properties.j2 b/templates/server.properties.j2
@@ -5,8 +5,8 @@
 
 # The id of the broker. This must be set to a unique integer for each broker.
 # If left off one is auto-assigned
-{% if sansible_kafka_aws_cluster_autodiscover_data is defined %}
-broker.id={{ sansible_kafka_aws_cluster_autodiscover_data_id }}
+{% if sansible_kafka_aws_cluster_assigned_id is defined %}
+broker.id={{ sansible_kafka_aws_cluster_assigned_id }}
 {% else %}
 broker.id={{ sansible_kafka_id }}
 {% endif %}