From aadcbc4507a489d4a4d0bfa451e9aa69f22b550f Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Thu, 9 Jul 2015 10:25:29 -0400
Subject: Latest docker ships docker-storage-setup
---
.../aws/openshift-cluster/templates/user_data.j2 | 19 +++----------------
1 file changed, 3 insertions(+), 16 deletions(-)
(limited to 'playbooks/aws/openshift-cluster/templates')
diff --git a/playbooks/aws/openshift-cluster/templates/user_data.j2 b/playbooks/aws/openshift-cluster/templates/user_data.j2
index 7dbc8f552..aea43026f 100644
--- a/playbooks/aws/openshift-cluster/templates/user_data.j2
+++ b/playbooks/aws/openshift-cluster/templates/user_data.j2
@@ -1,17 +1,4 @@
#cloud-config
-yum_repos:
- jdetiber-copr:
- name: Copr repo for origin owned by jdetiber
- baseurl: https://copr-be.cloud.fedoraproject.org/results/jdetiber/origin/epel-7-$basearch/
- skip_if_unavailable: true
- gpgcheck: true
- gpgkey: https://copr-be.cloud.fedoraproject.org/results/jdetiber/origin/pubkey.gpg
- enabled: true
-
-packages:
-- xfsprogs # can be dropped after docker-storage-setup properly requires it: https://github.com/projectatomic/docker-storage-setup/pull/8
-- docker-storage-setup
-
mounts:
- [ xvdb ]
- [ ephemeral0 ]
@@ -24,6 +11,6 @@ write_files:
owner: root:root
permissions: '0644'
-runcmd:
-- systemctl daemon-reload
-- systemctl enable lvm2-lvmetad.service docker-storage-setup.service
+{% if deployment_type == 'online' %}
+disable_root: 0
+{% endif %}
--
cgit v1.2.3