diff --git a/compose.yaml b/compose.yaml index ecc3c060..d03e2d10 100644 --- a/compose.yaml +++ b/compose.yaml @@ -48,6 +48,7 @@ services: - -ce - | ansible -m metalstack.base.metal_stack_release_vector localhost --extra-vars "@.extra_vars.yaml" + ansible-playbook install_v2_client.yaml ansible-playbook deploy_partition.yaml --extra-vars "@.extra_vars.yaml" metalctl: diff --git a/deploy_partition.yaml b/deploy_partition.yaml index 6c8d2a89..ac0bd8b4 100644 --- a/deploy_partition.yaml +++ b/deploy_partition.yaml @@ -62,7 +62,6 @@ roles: - name: ansible-common - - name: metal-roles/common/roles/metal-v2-client - name: metal-roles/common/roles/metal-deployment-token - name: Deploy mgmt-server components on leaf01 @@ -71,6 +70,7 @@ - name: ansible-common - name: metal-roles/partition/roles/pixiecore - name: metal-roles/common/roles/metal-deployment-token + when: deploy_partition_image_cache - name: metal-roles/partition/roles/image-cache when: deploy_partition_image_cache @@ -95,6 +95,7 @@ roles: - name: ansible-common tags: always + - name: metal-roles/common/roles/metal-deployment-token - name: metal-roles/partition/roles/metal-core tags: metal-core vars: @@ -113,6 +114,7 @@ roles: - name: ansible-common tags: always + - name: metal-roles/common/roles/metal-deployment-token - name: metal-roles/partition/roles/metal-core tags: metal-core diff --git a/install_v2_client.yaml b/install_v2_client.yaml new file mode 100644 index 00000000..5a26b402 --- /dev/null +++ b/install_v2_client.yaml @@ -0,0 +1,7 @@ +--- +- name: Install python client + hosts: localhost + connection: local + gather_facts: false + roles: + - name: metal-roles/common/roles/metal-v2-client diff --git a/inventories/group_vars/all/release_vector.yaml b/inventories/group_vars/all/release_vector.yaml index 4a7f2eca..87956446 100644 --- a/inventories/group_vars/all/release_vector.yaml +++ b/inventories/group_vars/all/release_vector.yaml @@ -22,8 +22,8 @@ metal_stack_release_vectors: # metal_masterdata_api_image_tag: # metal_console_image_name: # metal_console_image_tag: -# metal_core_image_name: -# metal_core_image_tag: +metal_core_image_tag: migrate-to-v2 +metal_core_image_name: ghcr.io/metal-stack/metal-core # headscale_image_tag: # headscale_db_backup_restore_sidecar_image_tag: # headscale_db_backup_restore_sidecar_image_name: @@ -39,7 +39,7 @@ metal_stack_release_vectors: ## # ansible_common_version: -# metal_roles_version: +metal_roles_version: pr-506-metal-core-to-v2 # metal_ansible_modules_version: ## diff --git a/inventories/group_vars/partition/common.yaml b/inventories/group_vars/partition/common.yaml index bb3791fe..0d800035 100644 --- a/inventories/group_vars/partition/common.yaml +++ b/inventories/group_vars/partition/common.yaml @@ -3,6 +3,7 @@ metal_partition_timezone: Europe/Berlin metal_partition_id: mini-lab metal_partition_metal_api_protocol: http +metal_partition_metal_apiserver_url: http://v2.{{ metal_control_plane_gateway_dns }} metal_partition_metal_api_addr: api.{{ metal_control_plane_gateway_dns }} metal_partition_metal_api_port: 80 metal_partition_metal_api_basepath: /metal/