Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable O365 plugins and use ARM "condition" #32

Merged
merged 7 commits into from
Feb 8, 2018

Conversation

hosungsmsft
Copy link

Office 365 Moodle plugins for Moodle v3.4 were recently released, so they can be installed by default. This change will install O365 plugins by default (no switch, though).

Also, this PR tries to simplify the conditional deployment by using ARM's "condition" property and removing the blank *config0.json files.

Test: Deployed the new templates on the default params only and confirmed they work, with O365 plugins installed on Moodle.

Copy link
Contributor

@SorraTheOrc SorraTheOrc left a comment

Choose a reason for hiding this comment

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

This is great, but we ought to keep the O365 installation optional.

# install Office 365 plugins
#if [ "$installOfficePlugins" = "True" ]; then
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like this change will always install the O365 plugins, they should be optional. Not all Moodle users need them.

Copy link
Author

@hosungsmsft hosungsmsft Feb 5, 2018

Choose a reason for hiding this comment

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

Fair enough, but my excuse is that we already install the ElasticSearch plugin (and dependencies) and the 3 VMs without any option. Shouldn't we make all these optional then? Note that that'll be a bigger code change.

Also note that the $installOfficePlugins env var was never defined at all, so I just couldn't uncomment the line (which is equivalent to no change at all).

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah - that should be optional too :-)

# install Office 365 plugins
#if [ "$installOfficePlugins" = "True" ]; then
Copy link
Contributor

Choose a reason for hiding this comment

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

ditto the comment above for the MySQL install.

As an aside we should look to remove as much duplication between the postgres and MySQL install scripts as possible. No need to block this PR on it, but something to bear in mind.

Copy link
Author

Choose a reason for hiding this comment

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

Absolutely. I mentioned about this code duplication and wanted to do that properly, but that'll require some nontrivial refactoring of the shell scripts and modularization of that. I gave it some thoughts how to achieve that, but I realized that it's actually nontrivial. This is in line with our discussion with Anand about how applications are deployed through ARM. The current CustomScript extension-based one is quite crude and clunky, and yet there doesn't seem to be a good alternative yet.

Copy link
Contributor

Choose a reason for hiding this comment

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

on ACS we used Cloud Init to great effect . I think it would serve our purpose here too. But again, we should make this separate from this PR which is valuable without that bigger change.

@hosungsmsft
Copy link
Author

@rgardler Please take another look. Now O365 plugins and ElasticSearch (plugins & VMs) are both optional.

@hosungsmsft hosungsmsft force-pushed the hs-condition-o365 branch 2 times, most recently from abd073f to e09b5a1 Compare February 7, 2018 15:33
@SorraTheOrc
Copy link
Contributor

LGTM, overlaps #35, fixes #29

@hosungsmsft hosungsmsft merged commit 9dce0c8 into Azure:master Feb 8, 2018
@hosungsmsft hosungsmsft deleted the hs-condition-o365 branch February 8, 2018 17:03
SorraTheOrc pushed a commit that referenced this pull request Feb 8, 2018
PR #32 changed the way we manage logic in the template to use the ARM conditional statements. Update the sample parameters file to match.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants