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')
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
From 76ad5ac0475a6d1d643b833d19aa0240b3ac95a5 Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Thu, 9 Jul 2015 11:38:26 -0400
Subject: grow and resize /var partition for online deployment_type
---
playbooks/aws/openshift-cluster/templates/user_data.j2 | 7 +++++++
1 file changed, 7 insertions(+)
(limited to 'playbooks/aws/openshift-cluster')
diff --git a/playbooks/aws/openshift-cluster/templates/user_data.j2 b/playbooks/aws/openshift-cluster/templates/user_data.j2
index aea43026f..22cccd977 100644
--- a/playbooks/aws/openshift-cluster/templates/user_data.j2
+++ b/playbooks/aws/openshift-cluster/templates/user_data.j2
@@ -1,4 +1,6 @@
#cloud-config
+devices: ['/var'] # Workaround for https://bugs.launchpad.net/bugs/1455436
+
mounts:
- [ xvdb ]
- [ ephemeral0 ]
@@ -13,4 +15,9 @@ write_files:
{% if deployment_type == 'online' %}
disable_root: 0
+growpart:
+ mode: auto
+ devices: ['/var']
+runcmd:
+- xfs_growfs /var
{% endif %}
--
cgit v1.2.3
From bcf750f83a87934027358a4631efa54bed73c05f Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Thu, 9 Jul 2015 14:49:57 -0400
Subject: include user_data template for all host types
---
playbooks/aws/openshift-cluster/tasks/launch_instances.yml | 2 +-
playbooks/aws/openshift-cluster/templates/user_data.j2 | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
(limited to 'playbooks/aws/openshift-cluster')
diff --git a/playbooks/aws/openshift-cluster/tasks/launch_instances.yml b/playbooks/aws/openshift-cluster/tasks/launch_instances.yml
index 060147659..d643b647d 100644
--- a/playbooks/aws/openshift-cluster/tasks/launch_instances.yml
+++ b/playbooks/aws/openshift-cluster/tasks/launch_instances.yml
@@ -51,7 +51,7 @@
- set_fact:
latest_ami: "{{ ami_result.results | oo_ami_selector(ec2_image_name) }}"
- user_data: "{{ lookup('template', '../templates/user_data.j2') if type == 'node' else None | default('omit') }}"
+ user_data: "{{ lookup('template', '../templates/user_data.j2') }}"
volume_defs:
master:
root:
diff --git a/playbooks/aws/openshift-cluster/templates/user_data.j2 b/playbooks/aws/openshift-cluster/templates/user_data.j2
index 22cccd977..db14bacd1 100644
--- a/playbooks/aws/openshift-cluster/templates/user_data.j2
+++ b/playbooks/aws/openshift-cluster/templates/user_data.j2
@@ -1,6 +1,5 @@
#cloud-config
-devices: ['/var'] # Workaround for https://bugs.launchpad.net/bugs/1455436
-
+{% if type == 'node' %}
mounts:
- [ xvdb ]
- [ ephemeral0 ]
@@ -12,8 +11,11 @@ write_files:
path: /etc/sysconfig/docker-storage-setup
owner: root:root
permissions: '0644'
+{% endif %}
{% if deployment_type == 'online' %}
+devices: ['/var'] # Workaround for https://bugs.launchpad.net/bugs/1455436
+
disable_root: 0
growpart:
mode: auto
--
cgit v1.2.3