Skip to content
This repository has been archived by the owner on Nov 24, 2021. It is now read-only.

Initial support of capsule settings #24

Merged
merged 16 commits into from
Feb 17, 2014
Merged

Initial support of capsule settings #24

merged 16 commits into from
Feb 17, 2014

Conversation

iNecas
Copy link
Member

@iNecas iNecas commented Feb 13, 2014

The capsule module serves as entry point for proxy/pulp node configuration (we
don't use the proxy module directly as we need to make sure the certs are set
properly).

This patch adds support for setting the proxy on the same machine as the
master. By default, the puppet and puppetca gets configured. Other features
can be added using --capsule-* configurations.

By default, it also registers the proxy into Foreman.

Also the README is update to reflect the latest changes. I've removed the
node-certs-generate and node-install stuff, as the recent changes in Katello
and the installer itself probably broke this feature, so for now, only
installing all-in-one should be working.

Therefore, also the node-certs-generate and node-install scripts are
disabled.

@iNecas
Copy link
Member Author

iNecas commented Feb 13, 2014

@iNecas
Copy link
Member Author

iNecas commented Feb 13, 2014

Scratch builds are available here http://koji.katello.org/koji/taskinfo?taskID=81541

@iNecas
Copy link
Member Author

iNecas commented Feb 14, 2014

Did some additional fixes, new scratch build should be available here http://koji.katello.org/koji/taskinfo?taskID=81686

@ehelms
Copy link
Member

ehelms commented Feb 14, 2014

Should we re-name the puppet-kafo module under the Katello organization to capsule and move this code to there?

@iNecas
Copy link
Member Author

iNecas commented Feb 15, 2014

Since, it's more an "integraion" module, that combines the rest of modules together, I wonder if it deserves separate module in the first place. On the other hand, since we have separate repos for all other modules, it would probably feel more consistent. It would work both ways for me, if you prefer that, I can go for it

@ehelms
Copy link
Member

ehelms commented Feb 15, 2014

@iNecas Does the 'capsule' module focus on what is needed to setup a capsule and only a capsule? If that is the case, I think it makes sense on it's own as it helps keep it focused on what it's intended to do. If this is instead providing some helper functionality or orchestrating between various pieces, then I'd say keep it in the installer but change the name to reflect that.

@iNecas
Copy link
Member Author

iNecas commented Feb 15, 2014

I would say the second is the case, but I don't have better name for it

@ehelms
Copy link
Member

ehelms commented Feb 15, 2014

@iNecas If looking at the parameters in the 'capsule' module, it appears on the surface at least to deal with and handle anything related to setting up a capsule whether remotely or on the same server.

@iNecas
Copy link
Member Author

iNecas commented Feb 15, 2014

that's right

@ehelms
Copy link
Member

ehelms commented Feb 16, 2014

@iNecas So I vote encapsulate the capsule logic in it's own dedicated module to make it as clear and obvious as possible what handles that part of our setup.

@iNecas
Copy link
Member Author

iNecas commented Feb 16, 2014

Will do,thanks for input

The capsule module serves as entry point for proxy/pulp node
configuration (we don't use the proxy module directly as we
need to make sure the certs are set properly).

This patch adds support for setting the proxy on the same machine
as the master. By default, the puppet and puppetca gets configured.
Other features can be added using `--capsule-*` configurations.

By default, it also registers the proxy into Foreman.

Also the README is update to reflect the latest changes. I've removed
the node-certs-generate and node-install stuff, as the recent
changes in Katello and the installer itself probably broke this
feature, so for now, only installing all-in-one should be working.

Therefore, also the `node-certs-generate` and `node-install` scripts
are disabled.
Since we are combining more modules now, it's time to be more explicit
about what module the option belongs to: e.g. `--capsule-dns` instead
of `--dns`.
6a80309 Merge pull request Katello#6 from ehelms/cleanup
3983290 Cleaning up file definitions, flatterning templates directory structure and reducing dependencies.

git-subtree-dir: modules/candlepin
git-subtree-split: 6a8030994273efff3b0a74fab3922cbe679b2cd1
git-subtree-dir: modules/capsule
git-subtree-split: 131a8fdf60079cecb06cc29d00a82b05092bcb5d
75bb0e6 Merge pull request Katello#8 from iNecas/capsule
01eddaf Capsule related certs settings
1ae1843 Merge pull request Katello#7 from jlsherrill/cert_perms
95d0c61 fixing perms on apache key cert

git-subtree-dir: modules/certs
git-subtree-split: 75bb0e6aab51ed986eed94da80c655af4f297436
18f4d5d Merge pull request Katello#13 from iNecas/capsule
5bc0363 Make sure the foreman certs are configured properly
43cf140 Merge pull request Katello#8 from jlsherrill/cert_easy
8fa95f4 Merge pull request Katello#11 from jlsherrill/user
8b22025 adding cert key and crl to pulp
30c35c0 adding apache user to the foreman group

git-subtree-dir: modules/katello
git-subtree-split: 18f4d5d
9366559 Merge pull request Katello#9 from jlsherrill/plugins
797f4e1 adding plugin confs to puppet module
8f13bde Merge pull request Katello#10 from ehelms/apache-include
ef8dc54 Changing apache to an include and including extra RPMs to install with Pulp.

git-subtree-dir: modules/pulp
git-subtree-split: 93665595c9c2ac524332b4b9026713bebef8309a
@iNecas
Copy link
Member Author

iNecas commented Feb 17, 2014

I've extracted the capsule module into separate repo. also updated the rest of katello modules, so that after merging this.we should get the updated katello-installer

02b8cbe Merge pull request Katello#12 from ehelms/add-candlepin-certs
642bdf4 Adding Candlepin certs setup removed from the Candlepin module itself.

git-subtree-dir: modules/katello
git-subtree-split: 02b8cbe
--certs-tar ~/certs.tar.gz\
--verbose
katello-installer --capsule-dns true\
--capsule-dns-forwarders 8.8.8.8 --dns-forwarders 8.8.4.4\
Copy link
Member

Choose a reason for hiding this comment

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

I got unrecognized option dns-forwarders -- is the second invocation listed here a typo?

Copy link
Member Author

Choose a reason for hiding this comment

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

It's meant to be there twice (adding two forwareds) just missing --capsule prefix

@ehelms
Copy link
Member

ehelms commented Feb 17, 2014

Unsure if this workflow is supported (I assumed it would be possible):

  1. Run install without any capsule options
  2. Re-run install with capsule options

Running with capsule options I got:

[ERROR 2014-02-17 15:33:49 verbose] /Stage[main]/Dns::Service/Service[named]/ensure: change from stopped to running failed: Could not start Service[named]: Execution of '/vagrant/katello-installer/modules/service_wait/bin/service-wait named start' returned 2: at /vagrant/katello-installer/modules/dns/manifests/service.pp:8

Note: I had to remove the --dns-forwarders declaration due to unrecognized option error.

@iNecas
Copy link
Member Author

iNecas commented Feb 17, 2014

Btw. scratch builds are available here http://koji.katello.org/koji/taskinfo?taskID=82345

@iNecas
Copy link
Member Author

iNecas commented Feb 17, 2014

@ehelms the issue might be probably missing --capsule-dns-zone option (update the example) or some other incorrect value (maybe the virbr1). Check /var/log/messages for more info.

@iNecas
Copy link
Member Author

iNecas commented Feb 17, 2014

btw. the workflow you mentioned should be supported

@ehelms
Copy link
Member

ehelms commented Feb 17, 2014

ACK

iNecas added a commit that referenced this pull request Feb 17, 2014
Initial support of capsule settings
@iNecas iNecas merged commit 88c4983 into Katello:master Feb 17, 2014
zjhuntin pushed a commit to zjhuntin/katello-installer that referenced this pull request Oct 30, 2018
Require the common dependencies once
# for free to subscribe to this conversation on GitHub. Already have an account? #.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants