summaryrefslogtreecommitdiffstats
path: root/playbooks/aws
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-03-24 09:43:17 -0400
committerThomas Wiest <twiest@users.noreply.github.com>2015-03-24 09:43:17 -0400
commit1c1df6a5733626865efc607d063f2a2a9b80499b (patch)
treea36eb1c82d7dfe382522cb3db10c741c5ea8682c /playbooks/aws
parent1686e24048b34d365e740f72ab9ad1962c26da2c (diff)
parent3d4144c56731d3efdfd0c34083256e139f8e9571 (diff)
downloadopenshift-1c1df6a5733626865efc607d063f2a2a9b80499b.tar.gz
openshift-1c1df6a5733626865efc607d063f2a2a9b80499b.tar.bz2
openshift-1c1df6a5733626865efc607d063f2a2a9b80499b.tar.xz
openshift-1c1df6a5733626865efc607d063f2a2a9b80499b.zip
Merge pull request #118 from liangxia/master
minor fix
Diffstat (limited to 'playbooks/aws')
-rw-r--r--playbooks/aws/openshift-master/config.yml2
-rw-r--r--playbooks/aws/openshift-node/config.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/aws/openshift-master/config.yml b/playbooks/aws/openshift-master/config.yml
index 3d6238360..b3227afa9 100644
--- a/playbooks/aws/openshift-master/config.yml
+++ b/playbooks/aws/openshift-master/config.yml
@@ -34,7 +34,7 @@
- {
role: openshift_master,
openshift_node_ips: "{{ hostvars['localhost'].openshift_node_ips | default(['']) }}",
- openshift_env: "{{ oo_env }}"
+ openshift_env: "{{ oo_env }}",
openshift_public_ip: "{{ ec2_ip_address }}"
}
- pods
diff --git a/playbooks/aws/openshift-node/config.yml b/playbooks/aws/openshift-node/config.yml
index d39ad781f..21807b1cf 100644
--- a/playbooks/aws/openshift-node/config.yml
+++ b/playbooks/aws/openshift-node/config.yml
@@ -41,7 +41,7 @@
role: openshift_node,
openshift_master_ips: "{{ hostvars['localhost'].openshift_master_ips | default(['']) }}",
openshift_master_public_ips: "{{ hostvars['localhost'].openshift_master_public_ips | default(['']) }}",
- openshift_env: "{{ oo_env }}"
+ openshift_env: "{{ oo_env }}",
openshift_public_ip: "{{ ec2_ip_address }}"
}
- docker