Adapt to metal-core refactoring. (#84)

metal-stack · Jun 15, 2022 · f08d96e · f08d96e
1 parent 8f2e7f3
commit f08d96e
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git a/partition/roles/metal-core/README.md b/partition/roles/metal-core/README.md
@@ -12,7 +12,6 @@ You can look up all the default values of this role [here](defaults/main/main.ya
 | ----------------------------------------- | --------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | metal_core_image_name                     | yes       | Image name of metal-core                                                                                                                                                   |
 | metal_core_image_tag                      | yes       | Image tag of metal-core                                                                                                                                                    |
-| metal_core_port                           |           | The port that metal-core is listening on                                                                                                                                   |
 | metal_core_cidr                           |           |                                                                                                                                                                            |
 | metal_core_log_level                      |           | The metal-core log level                                                                                                                                                   |
 | metal_core_rack_id                        | yes       | The rack id describing the rack in which the leaf switches are contained. Can be a logical rack name and is used by the metal-api to identify the switch pair              |

diff --git a/partition/roles/metal-core/defaults/main/main.yaml b/partition/roles/metal-core/defaults/main/main.yaml
@@ -1,5 +1,4 @@
 ---
-metal_core_port: 4242
 metal_core_log_level: warn
 metal_core_hmac_key: change-me
 metal_core_rack_id:

diff --git a/partition/roles/metal-core/tasks/main.yaml b/partition/roles/metal-core/tasks/main.yaml
@@ -75,8 +75,8 @@
     systemd_service_environment: "{{ lookup('template', 'metal-core-env.j2') | from_yaml }}"
     systemd_external_config_changed: "{{ nsq_certs is changed or grpc_certs is changed }}"
 
-- name: wait for metal-core to listen on port
+- name: wait for metal-core to listen on metrics port
   wait_for:
-    port: "{{ metal_core_port }}"
+    port: 2112
     timeout: 300
     msg: "metal-core did not come up"
diff --git a/partition/roles/metal-core/templates/metal-core-env.j2 b/partition/roles/metal-core/templates/metal-core-env.j2
@@ -7,7 +7,6 @@ METAL_CORE_CIDR: "{{ metal_core_cidr }}"
 METAL_CORE_PARTITION_ID: "{{ metal_partition_id }}"
 METAL_CORE_RACK_ID: "{{ metal_core_rack_id }}"
 METAL_CORE_BIND_ADDRESS: 0.0.0.0
-METAL_CORE_PORT: "{{ metal_core_port }}"
 METAL_CORE_MACHINE_TOPIC: "{{ metal_partition_id }}-machine"
 METAL_CORE_SWITCH_TOPIC: "{{ metal_partition_id }}-switch"
 METAL_CORE_METAL_API_IP: "{{ metal_partition_metal_api_addr }}"