[Backport] Multiple devstack releases with one machine by ztraboo · Pull Request #564 · openedx-unsupported/devstack

ztraboo · 2020-07-24T02:36:46Z

Committing this update for juniper release since it didn't exist yet.

@kdmccormick, @jmbowman, @arbrandes, @regisb

https://discuss.openedx.org/t/docker-devstack-multiple-releases-one-machine/1902
Multiple devstack releases with one machine.

This is in regards to this pull request
https://github.com/edx/devstack/pull/532
Updating volumes for themes to work with the ironwood release.

Applying these changes to get local devstack working for ironwood release.

https://github.com/edx/devstack/pull/376
https://github.com/edx/devstack/pull/377
Moved COMPOSE_PROJECT_NAME update to options.mk file.

Additional changes to get devstack_docker for Ironwood working multisite environment setup.

openedx-webhooks · 2020-07-24T02:36:52Z

Thanks for the pull request, @ztraboo! I've created OSPR-4854 to keep track of it in JIRA, where we prioritize reviews. Please note that it may take us up to several weeks or months to complete a review and merge your PR.

Feel free to add as much of the following information to the ticket:

supporting documentation
Open edX discussion forum threads
timeline information ("this must be merged by XX date", and why that is)
partner information ("this is a course on edx.org")
any other information that can help Product understand the context for the PR

All technical communication about the code itself will be done via the GitHub pull request interface. As a reminder, our process documentation is here.

Please let us know once your PR is ready for our review and all tests are green.

natabene · 2020-07-27T02:41:57Z

@ztraboo Thank you for your contribution. Is this ready for edX to review?

ztraboo · 2020-07-27T12:41:56Z

@natabene Yes ready for edX review.

regisb

I really like the fact that we are replacing most docker commands by docker-compose. I'd just like to clarify some questions, as I didn't take the time to run this PR locally myself.

ztraboo · 2020-07-27T17:52:45Z

@regisb Made another update edx/devstack@037c229 to align with what we did in https://github.com/edx/devstack/pull/532 for the master release. This adds a Makefile > dev.print-container.% target to find the ID of the container since the containers will be different per named release and therefore we need to identify which container we're using.

Also I provisioned this again and I didn't see any immediate errors.

ztraboo · 2020-07-27T20:51:23Z

@regisb @kdmccormick @arbrandes Finally got around to adding documentation on how to use this multiple devstack same host here hhttps://github.com/edx/devstack/pull/564/commits/261bc6cefbfff33774cd08dabd1f1aab7a813fe5. I did this for the master branch here https://github.com/edx/devstack/pull/569.

ztraboo · 2020-07-28T16:22:31Z

@regisb Updated README.rst for documentation related to Juniper https://github.com/CUCWD/devstack/tree/ztraboo.juniper/multiple-releases-one-machine#how-do-i-run-multiple-named-open-edx-releases-on-same-machine. Please review when you have time.

regisb · 2020-08-02T14:40:37Z

@ztraboo I just need to understand the container_name and alias thing and then this will be ready to merge.

natabene · 2020-08-03T16:37:11Z

@regisb You are planning to review and merge this as a core committer, correct?

ztraboo · 2020-08-17T02:36:09Z

@regisb Just made this commit edx/devstack@b73a147 to update the README.rst file for this PR instead of waiting for https://github.com/edx/devstack/pull/569 to be merged and backporting the change to Juniper from master branch.

This LGTM. @ztraboo can you please rebase on top of master?

I rebased on top of open-release/juniper.master.

Also, you should replace the commit that updates the README.rst and add the commit with the better phrasing from PR #569. Maybe it would make sense to merge #569 first and then backport that commit in this PR.

Instead of removing the README.rst commits in this PR I just updated it to reflect what was done with https://github.com/edx/devstack/pull/569 and changed commands for stopping containers to make stop.all to reflect Juniper commands as indicated here edx/devstack@b73a147. This was updated to make dev.stop in the master release.

regisb · 2020-08-17T08:44:27Z

This looks ready to merge! @ztraboo would you like to squash some of your commits or should I merge this as it is?

ztraboo · 2020-08-17T12:31:23Z

@regisb

This looks ready to merge! @ztraboo would you like to squash some of your commits or should I merge this as it is?

I can squash all commits if needed. Would it be helpful to some to see what changes were done rather than all together as one commit? Does squashing commits make it easier to see what this PR changes were done in one commit rather than separated out? Please advise.

regisb · 2020-08-17T12:37:26Z

Personnally, I prefer to squash together the commits that impact the same features or things. For instance, I would squash the commits that affect the README. If one particular commit fixes a bug that is not related to the other features from this PR, then this commit should stand on its own and not be squashed. Commits that all pertain to a single feature, such as "modify implementation according to regisb's bloody nitpickings" (:wink:) should be squashed in a single features.

…tainers for multi-version devstack support https://discuss.openedx.org/t/docker-devstack-multiple-releases-one-machine/1902 Multiple devstack releases with one machine. This is in regards to this pull request https://github.com/edx/devstack/pull/532 Updating volumes for `themes` to work with the `ironwood` release. Applying these changes to get local devstack working for ironwood release. https://github.com/edx/devstack/pull/376 https://github.com/edx/devstack/pull/377 Moved `COMPOSE_PROJECT_NAME` update to `options.mk` file. Additional changes to get `devstack_docker` for Ironwood working multisite environment setup. Additional changes needed to make `docker` commands work making use of the `dev.print-container.%` target to get the container id. Reverting some of these commands back to `docker` type to align with what we did with edx/devstack@59f812e

…le isolated devstacks for same host. Make additional adjustments to the documentation for multiple releases one machine.

…commands for services outside of `docker-compose.yml`. Makes sure that other services (e.g. `xqueue`, etc) that are not defined in the docker-compose.yml file have the correct configuration passed to the `docker-compose exec` command to work properly.

@morenol

…s one machine (regisb review). Comments came from `master` edx/devstack@c0b482d Fix issue with `docker-compose config` not outputting configuration information when `$(DOCKER_COMPOSE_FILES)` was excluded from the command. It appears that leaving out `$(DOCKER_COMPOSE_FILES)` caused the `docker-compose config` to not include the **volume** information for services within the `docker-compose.yml` file, as well as, excluding additional services like `docker-compose-{analytics-pipeline,watchers}.yml` to name a few. Update provision-ecommerce.sh with recommended changes from @morenol Co-authored-by: morenol <13-10934@usb.ve> Merging additional updates based on openedx-unsupported#569 changes for the `readme` file. - All changes from https://github.com/edx/devstack/pull/569 changes from this.

ztraboo · 2020-08-17T12:43:17Z

@regisb Thanks for that explanation. I squashed some commits. Ready to merge.

openedx-webhooks · 2020-08-17T12:46:18Z

@ztraboo 🎉 Your pull request was merged!

Please take a moment to answer a two question survey so we can improve your experience in the future.

@kdmccormick

As discussed with @kdmccormick here edx/devstack@57455fe#commitcomment-41529836 we decided to remove `xqueue` since it is not needed by default devstack setup. This is a fix to recent PR https://github.com/edx/devstack/pull/564.

@kdmccormick

As discussed with @kdmccormick here edx/devstack@57455fe#commitcomment-41529836 we decided to remove `xqueue` since it is not needed by default devstack setup. This is a fix to recent PR https://github.com/edx/devstack/pull/564.

openedx-webhooks added needs triage open-source-contribution PR author is not from Axim or 2U labels Jul 24, 2020

ztraboo mentioned this pull request Jul 24, 2020

[Backport] Multiple devstack releases with one machine #538

Closed

ztraboo force-pushed the ztraboo.juniper/multiple-releases-one-machine branch from 37d9e35 to 9b5536b Compare July 24, 2020 13:04

openedx-webhooks added waiting on author PR author needs to resolve review requests, answer questions, fix tests, etc. and removed needs triage labels Jul 27, 2020

regisb reviewed Jul 27, 2020

View reviewed changes

Comment thread Makefile Outdated

Comment thread Makefile Outdated

Comment thread Makefile Outdated

Comment thread options.mk Outdated

Comment thread docker-compose-analytics-pipeline.yml

ztraboo force-pushed the ztraboo.juniper/multiple-releases-one-machine branch 5 times, most recently from 872dc53 to 1964d07 Compare July 27, 2020 20:49

ztraboo force-pushed the ztraboo.juniper/multiple-releases-one-machine branch from 1964d07 to 261bc6c Compare July 27, 2020 21:27

ztraboo force-pushed the ztraboo.juniper/multiple-releases-one-machine branch 2 times, most recently from d96df35 to f11bc36 Compare July 29, 2020 18:48

openedx-webhooks added engineering review and removed waiting on author PR author needs to resolve review requests, answer questions, fix tests, etc. labels Jul 30, 2020

regisb reviewed Aug 2, 2020

View reviewed changes

Comment thread Makefile

regisb reviewed Aug 2, 2020

View reviewed changes

Comment thread Makefile Outdated

openedx-webhooks added awaiting prioritization and removed engineering review labels Aug 3, 2020

natabene added the cc-reviewer label Aug 3, 2020

openedx-webhooks added needs triage and removed open edx community review labels Aug 16, 2020

ztraboo force-pushed the ztraboo.juniper/multiple-releases-one-machine branch from 0ae1c8a to 394df38 Compare August 17, 2020 02:03

natabene added open edx community review and removed needs triage labels Aug 17, 2020

ztraboo force-pushed the ztraboo.juniper/multiple-releases-one-machine branch 3 times, most recently from f2b4b87 to b73a147 Compare August 17, 2020 02:32

ztraboo added 5 commits August 17, 2020 08:40

Updated README to include necessary information when running multip…

09110f4

…le isolated devstacks for same host. Make additional adjustments to the documentation for multiple releases one machine.

Add xqueue to default services to provision initially.

ffcafdf

ztraboo force-pushed the ztraboo.juniper/multiple-releases-one-machine branch from b73a147 to 35d197b Compare August 17, 2020 12:42

regisb merged commit 8ff8dd0 into openedx-unsupported:open-release/juniper.master Aug 17, 2020

openedx-webhooks added needs triage merged and removed open edx community review labels Aug 17, 2020

ztraboo referenced this pull request Aug 17, 2020

Add xqueue to default services to provision initially.

57455fe

ztraboo mentioned this pull request Aug 17, 2020

Remove xqueue from DEFAULT_SERVICES fix for PR #564. #599

Merged

openedx-webhooks removed the needs triage label Jan 21, 2021

ztraboo mentioned this pull request Oct 26, 2021

[Backport] Multiple devstack releases with one machine CUCWD/devstack#7

Merged

Uh oh!

Conversation

ztraboo commented Jul 24, 2020

Uh oh!

openedx-webhooks commented Jul 24, 2020

Uh oh!

natabene commented Jul 27, 2020

Uh oh!

ztraboo commented Jul 27, 2020

Uh oh!

regisb left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ztraboo commented Jul 27, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ztraboo commented Jul 27, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ztraboo commented Jul 28, 2020

Uh oh!

Uh oh!

Uh oh!

regisb commented Aug 2, 2020

Uh oh!

natabene commented Aug 3, 2020

Uh oh!

ztraboo commented Aug 17, 2020

Uh oh!

regisb commented Aug 17, 2020

Uh oh!

ztraboo commented Aug 17, 2020

Uh oh!

regisb commented Aug 17, 2020

Uh oh!

ztraboo commented Aug 17, 2020

Uh oh!

openedx-webhooks commented Aug 17, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

ztraboo commented Jul 27, 2020 •

edited

Loading

ztraboo commented Jul 27, 2020 •

edited

Loading