diff --git a/apps/manual-kafka-cluster/collections.yml b/apps/manual-kafka-cluster/collections.yml index 51bd91c..a4ed148 100644 --- a/apps/manual-kafka-cluster/collections.yml +++ b/apps/manual-kafka-cluster/collections.yml @@ -2,6 +2,6 @@ collections: - name: community.crypto version: 2.15.1 - name: linode.cloud - version: 0.16.1 + version: 0.37.1 - name: community.general - version: 8.6.0 \ No newline at end of file + version: 8.6.0 diff --git a/apps/manual-kafka-cluster/group_vars/kafka/vars b/apps/manual-kafka-cluster/group_vars/kafka/vars index 0a8513b..9858d49 100644 --- a/apps/manual-kafka-cluster/group_vars/kafka/vars +++ b/apps/manual-kafka-cluster/group_vars/kafka/vars @@ -9,6 +9,7 @@ region: us-southeast image: linode/ubuntu24.04 group: linode_tags: +firewall_label: cluster_size: 3 client_count: 2 @@ -26,4 +27,4 @@ state_or_province_name: Pennsylvania locality_name: Philadelphia organization_name: Akamai Technologies email_address: webmaster@example.com -ca_common_name: Kafka RootCA \ No newline at end of file +ca_common_name: Kafka RootCA diff --git a/apps/manual-kafka-cluster/provision.yml b/apps/manual-kafka-cluster/provision.yml index 05bfe76..4625dd9 100644 --- a/apps/manual-kafka-cluster/provision.yml +++ b/apps/manual-kafka-cluster/provision.yml @@ -8,7 +8,16 @@ tasks: + - name: get firewall info + # https://galaxy.ansible.com/ui/repo/published/linode/cloud/content/module/firewall_info/ + linode.cloud.firewall_info: + label: '{{ firewall_label }}' + api_token: '{{ api_token }}' + register: firewall_info + when: firewall_label|d(False) + - name: creating kafka servers + # https://galaxy.ansible.com/ui/repo/published/linode/cloud/content/module/instance/ linode.cloud.instance: label: '{{ instance_prefix }}{{ item }}' api_token: '{{ api_token }}' @@ -21,6 +30,7 @@ ua_prefix: 'docs-kafka-occ' tags: '{{ linode_tags }}' state: present + firewall_id: '{{ (firewall_info.firewall|default({})).id|default(omit) }}' with_sequence: count='{{ cluster_size }}' - name: get info about the instances @@ -54,13 +64,13 @@ #jinja2: trim_blocks:False [kafka] {%- for count in range(cluster_size) %} - {{ info.results[count].instance.ipv4[0] }} {% if count < controller_count %}role='controller and broker'{%else%}role='broker only'{%endif%} + {{ info.results[count].networking.ipv4.public[0].rdns }} {% if count < controller_count %}role='controller and broker'{%else%}role='broker only'{%endif%} {%- endfor %} - name: wait for port 22 to become open wait_for: port: 22 - host: '{{ item.instance.ipv4[0] }}' + host: '{{ item.networking.ipv4.public[0].rdns }}' search_regex: OpenSSH delay: 10 connection: local diff --git a/apps/manual-kafka-cluster/requirements.txt b/apps/manual-kafka-cluster/requirements.txt index f2e0448..d8932ec 100644 --- a/apps/manual-kafka-cluster/requirements.txt +++ b/apps/manual-kafka-cluster/requirements.txt @@ -8,6 +8,6 @@ pyyaml==6.0.1 dnspython==2.2.1 passlib==1.7.4 ## cloud.linode module dependancies ## -linode-api4==5.15.1 +linode-api4==5.29.0 polling==0.3.2 ansible-specdoc==0.0.14