소스 검색

Merge pull request #2858 from lhuard1A/fix_list_after_create_on_libvirt_and_openstack

Fix the list done after cluster creation on libvirt and OpenStack
Jason DeTiberus 8 년 전
부모
커밋
420e6f1359
2개의 변경된 파일13개의 추가작업 그리고 0개의 파일을 삭제
  1. 1 0
      playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml
  2. 12 0
      playbooks/openstack/openshift-cluster/launch.yml

+ 1 - 0
playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml

@@ -116,6 +116,7 @@
     ansible_become: "{{ deployment_vars[deployment_type].become }}"
     groups: "tag_environment-{{ cluster_env }}, tag_host-type-{{ type }}, tag_sub-host-type-{{ g_sub_host_type }}, tag_clusterid-{{ cluster_id }}"
     openshift_node_labels: "{{ node_label }}"
+    libvirt_ip_address: "{{ item.1 }}"
   with_together:
     - '{{ instances }}'
     - '{{ ips }}'

+ 12 - 0
playbooks/openstack/openshift-cluster/launch.yml

@@ -107,6 +107,9 @@
       groups: 'meta-environment_{{ cluster_env }}, meta-host-type_etcd, meta-sub-host-type_default, meta-clusterid_{{ cluster_id }}'
       openshift_node_labels:
         type: "etcd"
+      openstack:
+        public_v4: '{{ item[2] }}'
+        private_v4: '{{ item[1] }}'
     with_together:
       - '{{ parsed_outputs.etcd_names }}'
       - '{{ parsed_outputs.etcd_ips }}'
@@ -121,6 +124,9 @@
       groups: 'meta-environment_{{ cluster_env }}, meta-host-type_master, meta-sub-host-type_default, meta-clusterid_{{ cluster_id }}'
       openshift_node_labels:
         type: "master"
+      openstack:
+        public_v4: '{{ item[2] }}'
+        private_v4: '{{ item[1] }}'
     with_together:
       - '{{ parsed_outputs.master_names }}'
       - '{{ parsed_outputs.master_ips }}'
@@ -135,6 +141,9 @@
       groups: 'meta-environment_{{ cluster_env }}, meta-host-type_node, meta-sub-host-type_compute, meta-clusterid_{{ cluster_id }}'
       openshift_node_labels:
         type: "compute"
+      openstack:
+        public_v4: '{{ item[2] }}'
+        private_v4: '{{ item[1] }}'
     with_together:
       - '{{ parsed_outputs.node_names }}'
       - '{{ parsed_outputs.node_ips }}'
@@ -149,6 +158,9 @@
       groups: 'meta-environment_{{ cluster_env }}, meta-host-type_node, meta-sub-host-type_infra, meta-clusterid_{{ cluster_id }}'
       openshift_node_labels:
         type: "infra"
+      openstack:
+        public_v4: '{{ item[2] }}'
+        private_v4: '{{ item[1] }}'
     with_together:
       - '{{ parsed_outputs.infra_names }}'
       - '{{ parsed_outputs.infra_ips }}'