From 09e41be0eb83e24f284b84015bb1abbd25f23dff Mon Sep 17 00:00:00 2001
From: Thomas Wiest <twiest@redhat.com>
Date: Tue, 26 May 2015 11:58:50 -0400
Subject: removed references to atomic proxy.
---
playbooks/aws/openshift-master/launch.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'playbooks/aws/openshift-master')
diff --git a/playbooks/aws/openshift-master/launch.yml b/playbooks/aws/openshift-master/launch.yml
index 6b3751682..51a0258f0 100644
--- a/playbooks/aws/openshift-master/launch.yml
+++ b/playbooks/aws/openshift-master/launch.yml
@@ -4,10 +4,10 @@
connection: local
gather_facts: no
-# TODO: modify atomic_ami based on deployment_type
+# TODO: modify g_ami based on deployment_type
vars:
inst_region: us-east-1
- atomic_ami: ami-86781fee
+ g_ami: ami-86781fee
user_data_file: user_data.txt
tasks:
@@ -18,13 +18,13 @@
keypair: libra
group: ['public']
instance_type: m3.large
- image: "{{ atomic_ami }}"
+ image: "{{ g_ami }}"
count: "{{ oo_new_inst_names | oo_len }}"
user_data: "{{ lookup('file', user_data_file) }}"
wait: yes
register: ec2
- - name: Add new instances public IPs to the atomic proxy host group
+ - name: Add new instances public IPs to the host group
add_host: "hostname={{ item.public_ip }} groupname=new_ec2_instances"
with_items: ec2.instances
--
cgit v1.2.3
From 3b660e9b3f3859d69371f12e18922274db7ad026 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9na=C3=AFc=20Huard?= <lhuard@amadeus.com>
Date: Mon, 8 Jun 2015 09:32:59 +0200
Subject: Replace the custom oo_len filter by the Jinja2 standard one: length
---
playbooks/aws/openshift-master/launch.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'playbooks/aws/openshift-master')
diff --git a/playbooks/aws/openshift-master/launch.yml b/playbooks/aws/openshift-master/launch.yml
index 51a0258f0..1cefad492 100644
--- a/playbooks/aws/openshift-master/launch.yml
+++ b/playbooks/aws/openshift-master/launch.yml
@@ -19,7 +19,7 @@
group: ['public']
instance_type: m3.large
image: "{{ g_ami }}"
- count: "{{ oo_new_inst_names | oo_len }}"
+ count: "{{ oo_new_inst_names | length }}"
user_data: "{{ lookup('file', user_data_file) }}"
wait: yes
register: ec2
--
cgit v1.2.3