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

Update docs #32

Merged
merged 18 commits into from
Feb 15, 2016
Merged

Update docs #32

merged 18 commits into from
Feb 15, 2016

Conversation

bastelfreak
Copy link
Member

this adds new infos to the docs about the DHCP endpoint

@bastelfreak bastelfreak mentioned this pull request Jan 28, 2016
@bastelfreak
Copy link
Member Author

this implements #24

@@ -24,10 +25,26 @@ Monkeying around with virtual machines and pxe configs.

## Setup

Create `marmoset.conf` before using marmoset! See `Configuration` for details.
Clone the repo, for example into /opt. Than copy the service file into the systemd directory and reload systemd to recognize the file:
Copy link
Member

Choose a reason for hiding this comment

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

"Clone the repository into a directory of your choice, /opt for example" , "then"

Copy link
Member Author

Choose a reason for hiding this comment

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

fixed

@bastelfreak
Copy link
Member Author

this should be merged after #31 because it adds readme for this PR

Copy the `marmoset.conf.example` to `marmoset.conf` and adjust the settings to your needs.
Checkout the Comments in the file our our [Configuration](#configuration) section.

Now we need to setup a virtualenv and install the requirement python packages (remove libvirt from the requirements.txt and `pkg-config libvirt gcc` from the list of packages to install if you don't want to manage VMs with marmoset):
Copy link
Member

Choose a reason for hiding this comment

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

"and install the required python packages"

Copy link
Member Author

Choose a reason for hiding this comment

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

fixed

@@ -34,9 +35,13 @@ Network:
# storage name is given.
Storage:

# this gets used for storing PXE options
Copy link
Member

Choose a reason for hiding this comment

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

"this will be used for"

Copy link
Member Author

Choose a reason for hiding this comment

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

fixed

@bastelfreak bastelfreak changed the title [WIP] Update docs Update docs Feb 15, 2016
@bastelfreak
Copy link
Member Author

in my opinion this is ready for merge now. but we should wait until we merge #31

@bastelfreak
Copy link
Member Author

👍 from @sebastianrakel on IRC

bastelfreak added a commit that referenced this pull request Feb 15, 2016
@bastelfreak bastelfreak merged commit efc36a6 into master Feb 15, 2016
@bastelfreak bastelfreak deleted the update-docs branch February 15, 2016 12:32
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