diff options
| author | Wesley Hearn <wesley.s.hearn@gmail.com> | 2015-07-09 17:40:42 -0400 |
|---|---|---|
| committer | Wesley Hearn <wesley.s.hearn@gmail.com> | 2015-07-09 17:40:42 -0400 |
| commit | b03b50a7a408470c28f2c8d1752cda541b75f8ee (patch) | |
| tree | 07d271dfbec69c4326e8922bf0a2d7be6b4f9224 | |
| parent | cf1db4f9feca8ee587f99d75c2bc441a1a0ef9fd (diff) | |
| parent | bcf750f83a87934027358a4631efa54bed73c05f (diff) | |
| download | openshift-b03b50a7a408470c28f2c8d1752cda541b75f8ee.tar.gz openshift-b03b50a7a408470c28f2c8d1752cda541b75f8ee.tar.bz2 openshift-b03b50a7a408470c28f2c8d1752cda541b75f8ee.tar.xz openshift-b03b50a7a408470c28f2c8d1752cda541b75f8ee.zip | |
Merge pull request #334 from detiber/fixCloudConfig
Latest docker ships docker-storage-setup
| -rw-r--r-- | playbooks/aws/openshift-cluster/tasks/launch_instances.yml | 2 | ||||
| -rw-r--r-- | playbooks/aws/openshift-cluster/templates/user_data.j2 | 26 |
2 files changed, 12 insertions, 16 deletions
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 7dbc8f552..db14bacd1 100644 --- a/playbooks/aws/openshift-cluster/templates/user_data.j2 +++ b/playbooks/aws/openshift-cluster/templates/user_data.j2 @@ -1,17 +1,5 @@ #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 - +{% if type == 'node' %} mounts: - [ xvdb ] - [ ephemeral0 ] @@ -23,7 +11,15 @@ 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 + devices: ['/var'] runcmd: -- systemctl daemon-reload -- systemctl enable lvm2-lvmetad.service docker-storage-setup.service +- xfs_growfs /var +{% endif %} |