diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2015-07-09 10:25:29 -0400 |
|---|---|---|
| committer | Jason DeTiberus <jdetiber@redhat.com> | 2015-07-09 10:25:44 -0400 |
| commit | aadcbc4507a489d4a4d0bfa451e9aa69f22b550f (patch) | |
| tree | 1a6b6d133d57602e91bbc532aeb42c97a363aca8 | |
| parent | 6f5e68fb4aa2e974dc5ec40a18206a7bcc6c137e (diff) | |
| download | openshift-aadcbc4507a489d4a4d0bfa451e9aa69f22b550f.tar.gz openshift-aadcbc4507a489d4a4d0bfa451e9aa69f22b550f.tar.bz2 openshift-aadcbc4507a489d4a4d0bfa451e9aa69f22b550f.tar.xz openshift-aadcbc4507a489d4a4d0bfa451e9aa69f22b550f.zip | |
Latest docker ships docker-storage-setup
| -rw-r--r-- | playbooks/aws/openshift-cluster/templates/user_data.j2 | 19 |
1 files changed, 3 insertions, 16 deletions
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 %} |