Skip to content
This repository has been archived by the owner on Oct 26, 2022. It is now read-only.

Remove the option during install to copy and customize all roles #76

Merged
merged 2 commits into from
May 12, 2020
Merged

Remove the option during install to copy and customize all roles #76

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ebbb48
Remove the option during install to copy and customize all roles -- o…
becw May 12, 2020
f6de7cd
Update changelog.
becw May 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 2 additions & 29 deletions tasks/vagrant.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<property name="default.enable_solr" value="Y" />
<property name="default.enable_https" value="Y" />
<property name="default.node_version" value="8" />
<property name="default.copy_roles" value="n" />
<property name="default.custom_playbook" value="n" />


Expand All @@ -22,17 +21,7 @@
<input propertyName="enable_solr" message="Enable Solr " promptChar="?" validArgs="Y,n" defaultValue="${default.enable_solr}" />
<input propertyName="enable_https" message="Enable HTTPS " promptChar="?" validArgs="Y,n" defaultValue="${default.enable_https}" />
<propertyprompt propertyName="node_version" defaultValue="${default.node_version}" promptText="Node version" promptCharacter=":" useExistingValue="true"/>
<input propertyName="copy_roles" message="Copy Ansible roles into your project for customization " promptChar="?" validArgs="Y,n" defaultValue="${default.copy_roles}" />

<if>
<equals arg1="${copy_roles}" arg2="n"/>
<then>
<input propertyName="custom_playbook" message="OR add an additional Ansible playbook to your project " promptChar="?" validArgs="Y,n" defaultValue="${default.custom_playbook}" />
</then>
<else>
<property name="custom_playbook" value="${default.custom_playbook}" />
</else>
</if>
<input propertyName="custom_playbook" message="Add a custom Ansible playbook to your project " promptChar="?" validArgs="Y,n" defaultValue="${default.custom_playbook}" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I always assume the default is in caps, so validArgs="y,N"?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, never mind! I see that it's case sensitive. Oops!


<!-- Source locations -->
<property name="vagrant.installdir" value="${application.startdir}"/>
Expand All @@ -42,22 +31,6 @@
<property name="vagrant.vagrantfile.dest" value="${vagrant.installdir}/Vagrantfile"/>

<!-- Install based on interactive prompt responses above -->
<if>
<equals arg1="${copy_roles}" arg2="Y"/>
<then>
<!-- Provision from copies of the playbooks from the-vagrant -->
<property name="vagrant.ansible.playbook" value="provisioning/${projectname}.yml"/>
<copy todir="${vagrant.installdir}/provisioning">
<fileset dir="${vagrant.ansible.source}"/>
</copy>
<move file="${vagrant.installdir}/provisioning/drupal8-skeleton.yml" tofile="${vagrant.installdir}/provisioning/${projectname}.yml"/>
</then>
<else>
<!-- Provision directly from the-vagrant playbooks -->
<property name="vagrant.ansible.playbook" value="vendor/palantirnet/the-vagrant/conf/vagrant/provisioning/drupal8-skeleton.yml"/>
</else>
</if>

<if>
<equals arg1="${custom_playbook}" arg2="Y"/>
<then>
Expand Down Expand Up @@ -105,7 +78,7 @@
<filterchain>
<replacetokens>
<token key="projectname" value="${projectname}"/>
<token key="playbook" value="${vagrant.ansible.playbook}"/>
<token key="playbook" value="vendor/palantirnet/the-vagrant/conf/vagrant/provisioning/drupal8-skeleton.yml"/>
<token key="ansible_solr_enabled" value="${ansible_solr_enabled}"/>
<token key="ansible_https_enabled" value="${ansible_https_enabled}"/>
<token key="ansible_node_version" value="${node_version}"/>
Expand Down