From 0ecefd20d06e67823cb033d4ac7ec4b57e613af6 Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Mon, 20 Apr 2015 23:45:15 -0400
Subject: Remove deployment-type tags
---
playbooks/aws/openshift-cluster/tasks/launch_instances.yml | 3 +--
playbooks/gce/openshift-cluster/tasks/launch_instances.yml | 1 -
playbooks/libvirt/openshift-cluster/templates/domain.xml | 1 -
3 files changed, 1 insertion(+), 4 deletions(-)
(limited to 'playbooks')
diff --git a/playbooks/aws/openshift-cluster/tasks/launch_instances.yml b/playbooks/aws/openshift-cluster/tasks/launch_instances.yml
index 58b4082df..77ee25424 100644
--- a/playbooks/aws/openshift-cluster/tasks/launch_instances.yml
+++ b/playbooks/aws/openshift-cluster/tasks/launch_instances.yml
@@ -26,7 +26,6 @@
env: "{{ env }}"
host-type: "{{ host_type }}"
env-host-type: "{{ env_host_type }}"
- deployment-type: "{{ deployment_type }}"
register: ec2
- name: Add Name tag to instances
@@ -39,7 +38,7 @@
Name: "{{ item.0 }}"
- set_fact:
- instance_groups: tag_created-by_{{ created_by }}, tag_env_{{ env }}, tag_host-type_{{ host_type }}, tag_env-host-type_{{ env_host_type }}, tag_deployment-type_{{ deployment_type }}
+ instance_groups: tag_created-by_{{ created_by }}, tag_env_{{ env }}, tag_host-type_{{ host_type }}, tag_env-host-type_{{ env_host_type }}
- name: Add new instances groups and variables
add_host:
diff --git a/playbooks/gce/openshift-cluster/tasks/launch_instances.yml b/playbooks/gce/openshift-cluster/tasks/launch_instances.yml
index a68edefae..9a9848f05 100644
--- a/playbooks/gce/openshift-cluster/tasks/launch_instances.yml
+++ b/playbooks/gce/openshift-cluster/tasks/launch_instances.yml
@@ -15,7 +15,6 @@
- env-{{ cluster }}
- host-type-{{ type }}
- env-host-type-{{ cluster }}-openshift-{{ type }}
- - deployment-type-{{ deployment_type }}
register: gce
- name: Add new instances to groups and set variables needed
diff --git a/playbooks/libvirt/openshift-cluster/templates/domain.xml b/playbooks/libvirt/openshift-cluster/templates/domain.xml
index 7656249da..df200e374 100644
--- a/playbooks/libvirt/openshift-cluster/templates/domain.xml
+++ b/playbooks/libvirt/openshift-cluster/templates/domain.xml
@@ -3,7 +3,6 @@
<memory unit='GiB'>1</memory>
<metadata xmlns:ansible="https://github.com/ansible/ansible">
<ansible:tags>
- <ansible:tag>deployment-type-{{ deployment_type }}</ansible:tag>
<ansible:tag>env-{{ cluster }}</ansible:tag>
<ansible:tag>env-host-type-{{ cluster }}-openshift-{{ type }}</ansible:tag>
<ansible:tag>host-type-{{ type }}</ansible:tag>
--
cgit v1.2.3