diff options
| author | Clayton Coleman <ccoleman@redhat.com> | 2017-12-21 03:14:04 -0500 |
|---|---|---|
| committer | Clayton Coleman <ccoleman@redhat.com> | 2018-01-23 10:52:07 -0500 |
| commit | 949f4eacd2aa47833e1283de284aaed1c7ce91fe (patch) | |
| tree | da6e3f36b196723433969372d5e1f37ef9cb4f97 /roles/openshift_gcp_image_prep | |
| parent | 91c78123abee34893f5b91ee78749bb3cabb5056 (diff) | |
| download | openshift-949f4eacd2aa47833e1283de284aaed1c7ce91fe.tar.gz openshift-949f4eacd2aa47833e1283de284aaed1c7ce91fe.tar.bz2 openshift-949f4eacd2aa47833e1283de284aaed1c7ce91fe.tar.xz openshift-949f4eacd2aa47833e1283de284aaed1c7ce91fe.zip | |
Move origin-gce roles and playbooks into openshift-ansible
This moves all core functionality into the openshift-ansible repo, adds
the necessary equivalent entrypoint to the openshift-ansible installer
image, and ensures the dynamic inventory mechanisms in openshift-ansible
continue to work.
Notable changes from origin-gce:
* playbook extensions changed to .yml
* dynamic inventory subdirectory created to prevent accidental use
* use the custom entrypoint entrypoint-gcp for this image
* move tasks into openshift_gcp role
Diffstat (limited to 'roles/openshift_gcp_image_prep')
| -rw-r--r-- | roles/openshift_gcp_image_prep/files/partition.conf | 3 | ||||
| -rw-r--r-- | roles/openshift_gcp_image_prep/tasks/main.yaml | 18 |
2 files changed, 0 insertions, 21 deletions
diff --git a/roles/openshift_gcp_image_prep/files/partition.conf b/roles/openshift_gcp_image_prep/files/partition.conf deleted file mode 100644 index b87e5e0b6..000000000 --- a/roles/openshift_gcp_image_prep/files/partition.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Service] -ExecStartPost=-/usr/bin/growpart /dev/sda 1 -ExecStartPost=-/sbin/xfs_growfs / diff --git a/roles/openshift_gcp_image_prep/tasks/main.yaml b/roles/openshift_gcp_image_prep/tasks/main.yaml deleted file mode 100644 index fee5ab618..000000000 --- a/roles/openshift_gcp_image_prep/tasks/main.yaml +++ /dev/null @@ -1,18 +0,0 @@ ---- -# GCE instances are starting with xfs AND barrier=1, which is only for extfs. -- name: Remove barrier=1 from XFS fstab entries - lineinfile: - path: /etc/fstab - regexp: '^(.+)xfs(.+?),?barrier=1,?(.*?)$' - line: '\1xfs\2 \4' - backrefs: yes - -- name: Ensure the root filesystem has XFS group quota turned on - lineinfile: - path: /boot/grub2/grub.cfg - regexp: '^(.*)linux16 (.*)$' - line: '\1linux16 \2 rootflags=gquota' - backrefs: yes - -- name: Ensure the root partition grows on startup - copy: src=partition.conf dest=/etc/systemd/system/google-instance-setup.service.d/ |