diff --git a/group_vars/stage_dev/plain.yml b/group_vars/stage_dev/plain.yml index 055f0c9..79d4a2e 100644 --- a/group_vars/stage_dev/plain.yml +++ b/group_vars/stage_dev/plain.yml @@ -69,33 +69,33 @@ shared_service_gitea_ip: "{{ stage_server_infos | map(attribute='private_ip') | list | first }}" -shared_service_k8s_master_01: "{{ stage_server_infos - | selectattr('name', 'match', stage + '-k8s-master-11' ) +shared_service_kube_master_01: "{{ stage_server_infos + | selectattr('name', 'match', stage + '-kube-master-01' ) | map(attribute='private_ip') | list | first }}" -shared_service_k8s_master_02: "{{ stage_server_infos - | selectattr('name', 'match', stage + '-k8s-master-12' ) +shared_service_kube_master_02: "{{ stage_server_infos + | selectattr('name', 'match', stage + '-kube-master-02' ) | map(attribute='private_ip') | list | first }}" -shared_service_k8s_master_03: "{{ stage_server_infos - | selectattr('name', 'match', stage + '-k8s-master-13' ) +shared_service_kube_master_03: "{{ stage_server_infos + | selectattr('name', 'match', stage + '-kube-master-03' ) | map(attribute='private_ip') | list | first }}" -shared_service_k8s_worker_01: "{{ stage_server_infos - | selectattr('name', 'match', stage + '-k8s-worker-11' ) +shared_service_kube_node_01: "{{ stage_server_infos + | selectattr('name', 'match', stage + '-kube-node-01' ) | map(attribute='private_ip') | list | first }}" -shared_service_k8s_worker_02: "{{ stage_server_infos - | selectattr('name', 'match', stage + '-k8s-worker-12' ) +shared_service_kube_node_02: "{{ stage_server_infos + | selectattr('name', 'match', stage + '-kube-node-02' ) | map(attribute='private_ip') | list | first }}" -shared_service_k8s_worker_03: "{{ stage_server_infos - | selectattr('name', 'match', stage + '-k8s-worker-13' ) +shared_service_kube_node_03: "{{ stage_server_infos + | selectattr('name', 'match', stage + '-kube-node-03' ) | map(attribute='private_ip') | list | first }}" @@ -108,12 +108,12 @@ shared_service_elastic_stack_03_hostname: "{{ stage }}-elastic-stack-elastic-03" shared_service_elastic_stack_logstash_01_hostname: "{{ stage }}-elastic-stack-logstash-01" -k8smaster_01_hostname: "{{ stage }}-k8s-master-11.{{ domain }}" -k8smaster_02_hostname: "{{ stage }}-k8s-master-12.{{ domain }}" -k8smaster_03_hostname: "{{ stage }}-k8s-master-13.{{ domain }}" -k8sworker_01_hostname: "{{ stage }}-k8s-worker-11.{{ domain }}" -k8sworker_02_hostname: "{{ stage }}-k8s-worker-12.{{ domain }}" -k8sworker_03_hostname: "{{ stage }}-k8s-worker-13.{{ domain }}" +kube_master_01_hostname: "{{ stage }}-kube-master-01.{{ domain }}" +kube_master_02_hostname: "{{ stage }}-kube-master-02.{{ domain }}" +kube_master_03_hostname: "{{ stage }}-kube-master-03.{{ domain }}" +kube_node_01_hostname: "{{ stage }}-kube-node-01.{{ domain }}" +kube_node_02_hostname: "{{ stage }}-kube-node-02.{{ domain }}" +kube_node_03_hostname: "{{ stage }}-kube-node-03.{{ domain }}" shared_service_iam_hostname: "{{ stage }}-iam-01.{{ domain }}" shared_service_mail_hostname: "{{ stage }}-mail-01.{{ domain }}" @@ -180,28 +180,28 @@ shared_service_hosts: [ name: "{{ shared_service_gitea_hostname }}" }, { - ip: "{{ shared_service_k8s_master_01 }}", - name: "{{ k8smaster_01_hostname }}" + ip: "{{ shared_service_kube_master_01 }}", + name: "{{ kube_master_01_hostname }}" }, { - ip: "{{ shared_service_k8s_master_02 }}", - name: "{{ k8smaster_02_hostname }}" + ip: "{{ shared_service_kube_master_02 }}", + name: "{{ kube_master_02_hostname }}" }, { - ip: "{{ shared_service_k8s_master_03 }}", - name: "{{ k8smaster_03_hostname }}" + ip: "{{ shared_service_kube_master_03 }}", + name: "{{ kube_master_03_hostname }}" }, { - ip: "{{ shared_service_k8s_worker_01 }}", - name: "{{ k8sworker_01_hostname }}" + ip: "{{ shared_service_kube_node_01 }}", + name: "{{ kube_node_01_hostname }}" }, { - ip: "{{ shared_service_k8s_worker_02 }}", - name: "{{ k8sworker_02_hostname }}" + ip: "{{ shared_service_kube_node_02 }}", + name: "{{ kube_node_02_hostname }}" }, { - ip: "{{ shared_service_k8s_worker_03 }}", - name: "{{ k8sworker_03_hostname }}" + ip: "{{ shared_service_kube_node_03 }}", + name: "{{ kube_node_03_hostname }}" } ]