I'm sending this as a pull request[1] instead of patches, as this is a large changeset and the probability of something getting lost or mangled is high.
Fedora 17 is now using Puppet 2.7. This corrects some compatibility issues with configure so it will work with Puppet 2.7. These changes are also backwards compatible with Puppet 2.6, so this will work for distros that do not use 2.7 yet (e.g. Fedora 16).
Note that you will need the other configure patchset that I just sent to the list ("Various test and rake fixes for F17 compatibility") if you expect to be able to run `rake rpms` after applying this in order to test.
To apply this to a branch, just run:
git pull git://github.com/jeckersb/aeolus-configure.git puppet-2.7
[1] See http://git-scm.com/docs/git-request-pull ---
The following changes since commit 258d5c4e88950d48c5a4bef17e3b084c1beabb1d:
RM3172 Allow standalone imagefactory/iwhd installation (2012-05-09 10:56:19 -0500)
are available in the git repository at: git://github.com/jeckersb/aeolus-configure.git puppet-2.7
John Eckersberg (2): Fix module structure for puppet 2.7 autoloader Fix broken string interpolation
recipes/aeolus/manifests/conductor.pp | 191 +------------------- recipes/aeolus/manifests/conductor/disabled.pp | 39 ++++ recipes/aeolus/manifests/conductor/hwp.pp | 24 +++ recipes/aeolus/manifests/conductor/login.pp | 19 ++ recipes/aeolus/manifests/conductor/logout.pp | 12 ++ recipes/aeolus/manifests/conductor/provider.pp | 18 ++ .../aeolus/manifests/conductor/provider/account.pp | 43 +++++ recipes/aeolus/manifests/conductor/site_admin.pp | 17 ++ recipes/aeolus/manifests/create_bucket.pp | 7 + recipes/aeolus/manifests/deltacloud.pp | 71 -------- recipes/aeolus/manifests/deltacloud/core.pp | 28 +++ recipes/aeolus/manifests/deltacloud/disabled.pp | 18 ++ recipes/aeolus/manifests/deltacloud/ec2.pp | 7 + recipes/aeolus/manifests/image-factory.pp | 35 ---- recipes/aeolus/manifests/image-factory/disabled.pp | 13 ++ recipes/aeolus/manifests/image.pp | 22 +++ recipes/aeolus/manifests/init.pp | 13 -- recipes/aeolus/manifests/iwhd.pp | 32 ---- recipes/aeolus/manifests/iwhd/disabled.pp | 22 +++ recipes/aeolus/manifests/profiles/rhevm.pp | 9 - .../aeolus/manifests/profiles/rhevm/disabled.pp | 3 + recipes/aeolus/manifests/rails.pp | 58 ------ recipes/aeolus/manifests/rails/create/db.pp | 8 + recipes/aeolus/manifests/rails/drop/db.pp | 8 + recipes/aeolus/manifests/rails/migrate/db.pp | 7 + recipes/aeolus/manifests/rails/seed/db.pp | 15 ++ recipes/aeolus/manifests/rhevm/validate.pp | 6 + recipes/aeolus/manifests/selinux.pp | 27 --- recipes/aeolus/manifests/selinux/mode.pp | 10 + recipes/apache/manifests/init.pp | 13 -- recipes/apache/manifests/site.pp | 13 ++ recipes/ntp/manifests/client.pp | 33 ++++ recipes/ntp/manifests/init.pp | 35 ---- recipes/ntp/manifests/server.pp | 2 + recipes/openssl/manifests/certificate.pp | 12 ++ recipes/openssl/manifests/init.pp | 33 ---- recipes/openssl/manifests/key.pp | 19 ++ recipes/postgres/manifests/client.pp | 2 + recipes/postgres/manifests/init.pp | 51 ------ recipes/postgres/manifests/server.pp | 35 ++++ recipes/postgres/manifests/user.pp | 14 ++ 41 files changed, 482 insertions(+), 562 deletions(-) create mode 100644 recipes/aeolus/manifests/conductor/disabled.pp create mode 100644 recipes/aeolus/manifests/conductor/hwp.pp create mode 100644 recipes/aeolus/manifests/conductor/login.pp create mode 100644 recipes/aeolus/manifests/conductor/logout.pp create mode 100644 recipes/aeolus/manifests/conductor/provider.pp create mode 100644 recipes/aeolus/manifests/conductor/provider/account.pp create mode 100644 recipes/aeolus/manifests/conductor/site_admin.pp create mode 100644 recipes/aeolus/manifests/create_bucket.pp delete mode 100644 recipes/aeolus/manifests/deltacloud.pp create mode 100644 recipes/aeolus/manifests/deltacloud/core.pp create mode 100644 recipes/aeolus/manifests/deltacloud/disabled.pp create mode 100644 recipes/aeolus/manifests/deltacloud/ec2.pp create mode 100644 recipes/aeolus/manifests/image-factory/disabled.pp create mode 100644 recipes/aeolus/manifests/image.pp create mode 100644 recipes/aeolus/manifests/iwhd/disabled.pp create mode 100644 recipes/aeolus/manifests/profiles/rhevm/disabled.pp delete mode 100644 recipes/aeolus/manifests/rails.pp create mode 100644 recipes/aeolus/manifests/rails/create/db.pp create mode 100644 recipes/aeolus/manifests/rails/drop/db.pp create mode 100644 recipes/aeolus/manifests/rails/migrate/db.pp create mode 100644 recipes/aeolus/manifests/rails/seed/db.pp create mode 100644 recipes/aeolus/manifests/rhevm/validate.pp delete mode 100644 recipes/aeolus/manifests/selinux.pp create mode 100644 recipes/aeolus/manifests/selinux/mode.pp create mode 100644 recipes/apache/manifests/site.pp create mode 100644 recipes/ntp/manifests/client.pp create mode 100644 recipes/ntp/manifests/server.pp create mode 100644 recipes/openssl/manifests/certificate.pp create mode 100644 recipes/openssl/manifests/key.pp create mode 100644 recipes/postgres/manifests/client.pp create mode 100644 recipes/postgres/manifests/server.pp create mode 100644 recipes/postgres/manifests/user.pp
I've rebased this against eggs's changes for BZ806001. No other changes.
The following changes since commit 9bffb2ce99394ee9231734d9830d2977469155d0:
BZ 806001 aeolus-configure will always create an admin user, need to key of a uuid not name (2012-05-22 16:28:26 -0500)
are available in the git repository at: git://github.com/jeckersb/aeolus-configure.git puppet-2.7-v2
John Eckersberg (2): Fix module structure for puppet 2.7 autoloader Fix broken string interpolation
recipes/aeolus/manifests/conductor.pp | 218 +------------------- .../aeolus/manifests/conductor/default_admin.pp | 17 ++ .../manifests/conductor/destroy_temp_admin.pp | 9 + recipes/aeolus/manifests/conductor/disabled.pp | 39 ++++ recipes/aeolus/manifests/conductor/hwp.pp | 24 +++ recipes/aeolus/manifests/conductor/login.pp | 19 ++ recipes/aeolus/manifests/conductor/logout.pp | 12 + recipes/aeolus/manifests/conductor/provider.pp | 18 ++ .../aeolus/manifests/conductor/provider/account.pp | 43 ++++ recipes/aeolus/manifests/conductor/site_admin.pp | 17 ++ recipes/aeolus/manifests/conductor/temp_admin.pp | 14 ++ recipes/aeolus/manifests/create_bucket.pp | 7 + recipes/aeolus/manifests/deltacloud.pp | 71 ------- recipes/aeolus/manifests/deltacloud/core.pp | 28 +++ recipes/aeolus/manifests/deltacloud/disabled.pp | 18 ++ recipes/aeolus/manifests/deltacloud/ec2.pp | 7 + recipes/aeolus/manifests/image-factory.pp | 35 --- recipes/aeolus/manifests/image-factory/disabled.pp | 13 ++ recipes/aeolus/manifests/image.pp | 22 ++ recipes/aeolus/manifests/init.pp | 13 -- recipes/aeolus/manifests/iwhd.pp | 32 --- recipes/aeolus/manifests/iwhd/disabled.pp | 22 ++ recipes/aeolus/manifests/profiles/rhevm.pp | 9 - .../aeolus/manifests/profiles/rhevm/disabled.pp | 3 + recipes/aeolus/manifests/rails.pp | 58 ----- recipes/aeolus/manifests/rails/create/db.pp | 8 + recipes/aeolus/manifests/rails/drop/db.pp | 8 + recipes/aeolus/manifests/rails/migrate/db.pp | 7 + recipes/aeolus/manifests/rails/seed/db.pp | 15 ++ recipes/aeolus/manifests/rhevm/validate.pp | 6 + recipes/aeolus/manifests/selinux.pp | 27 --- recipes/aeolus/manifests/selinux/mode.pp | 10 + recipes/apache/manifests/init.pp | 13 -- recipes/apache/manifests/site.pp | 13 ++ recipes/ntp/manifests/client.pp | 33 +++ recipes/ntp/manifests/init.pp | 35 --- recipes/ntp/manifests/server.pp | 2 + recipes/openssl/manifests/certificate.pp | 12 + recipes/openssl/manifests/init.pp | 33 --- recipes/openssl/manifests/key.pp | 19 ++ recipes/postgres/manifests/client.pp | 2 + recipes/postgres/manifests/init.pp | 51 ----- recipes/postgres/manifests/server.pp | 35 +++ recipes/postgres/manifests/user.pp | 14 ++ 44 files changed, 522 insertions(+), 589 deletions(-) create mode 100644 recipes/aeolus/manifests/conductor/default_admin.pp create mode 100644 recipes/aeolus/manifests/conductor/destroy_temp_admin.pp create mode 100644 recipes/aeolus/manifests/conductor/disabled.pp create mode 100644 recipes/aeolus/manifests/conductor/hwp.pp create mode 100644 recipes/aeolus/manifests/conductor/login.pp create mode 100644 recipes/aeolus/manifests/conductor/logout.pp create mode 100644 recipes/aeolus/manifests/conductor/provider.pp create mode 100644 recipes/aeolus/manifests/conductor/provider/account.pp create mode 100644 recipes/aeolus/manifests/conductor/site_admin.pp create mode 100644 recipes/aeolus/manifests/conductor/temp_admin.pp create mode 100644 recipes/aeolus/manifests/create_bucket.pp delete mode 100644 recipes/aeolus/manifests/deltacloud.pp create mode 100644 recipes/aeolus/manifests/deltacloud/core.pp create mode 100644 recipes/aeolus/manifests/deltacloud/disabled.pp create mode 100644 recipes/aeolus/manifests/deltacloud/ec2.pp create mode 100644 recipes/aeolus/manifests/image-factory/disabled.pp create mode 100644 recipes/aeolus/manifests/image.pp create mode 100644 recipes/aeolus/manifests/iwhd/disabled.pp create mode 100644 recipes/aeolus/manifests/profiles/rhevm/disabled.pp delete mode 100644 recipes/aeolus/manifests/rails.pp create mode 100644 recipes/aeolus/manifests/rails/create/db.pp create mode 100644 recipes/aeolus/manifests/rails/drop/db.pp create mode 100644 recipes/aeolus/manifests/rails/migrate/db.pp create mode 100644 recipes/aeolus/manifests/rails/seed/db.pp create mode 100644 recipes/aeolus/manifests/rhevm/validate.pp delete mode 100644 recipes/aeolus/manifests/selinux.pp create mode 100644 recipes/aeolus/manifests/selinux/mode.pp create mode 100644 recipes/apache/manifests/site.pp create mode 100644 recipes/ntp/manifests/client.pp create mode 100644 recipes/ntp/manifests/server.pp create mode 100644 recipes/openssl/manifests/certificate.pp create mode 100644 recipes/openssl/manifests/key.pp create mode 100644 recipes/postgres/manifests/client.pp create mode 100644 recipes/postgres/manifests/server.pp create mode 100644 recipes/postgres/manifests/user.pp
Hrm, one thing that I don't like about these pull requests is that it makes it tricky to comment of specific bits of code in the review. With the send-patches-to-list approach, I can comment inline on specifics.
Regardless, a few notes:
1 - in the original patchset you mentioned that there was a prerequisite patch needed ("Various test and rake fixes for F17 compatibility") to build the rpms. I couldn't find this on the list (did I miss it?)
2 - I noticed in this patchset some modules were placed under the 'aeolus' namespace (eg the rails and rhevm config) while some modules were placed at the top level (eg the apache, ntp, openssl, postgres config). Was there a reason for this distinction?
3 - for the rails db manifests, I'd rather switch the ordering so that 'db' is the folder which contains puppet modules for 'drop', 'seed', 'create', 'migrate'. I'd be fine w/ including this change in a follow-on patch though
4 - on F17 with this patch set applied I get 'warning: Could not retrieve fact ipaddress', the default configure invocation seems to run successfully so am not sure if this affects anything or not (perhaps in a profile which I did not use?)
After I pull your changes in I was able to build and install an update aeolus-configure rpm on F17. The default invocation of configure didn't seem to run successfully though (tried a few times to no avail) but I'm not sure if this is due to an issue w/ configure or issues w/ the various components being configured on F17. Regardless these patches gets us closer to where we need to be so this is not a blocker.
Invoking the updated configure on F16 works as it did before (I just tried a few times w/ the default profile) so ACK provided this patchset doesn't entail any functional changes, just reorganizing things. (conductor-delayed_job did fail to start, but this was the same when I tried starting it manually via the command line)
-Mo
On 05/23/2012 09:26 PM, John Eckersberg wrote:
I've rebased this against eggs's changes for BZ806001. No other changes.
The following changes since commit 9bffb2ce99394ee9231734d9830d2977469155d0:
BZ 806001 aeolus-configure will always create an admin user, need to key of a uuid not name (2012-05-22 16:28:26 -0500)
are available in the git repository at: git://github.com/jeckersb/aeolus-configure.git puppet-2.7-v2
John Eckersberg (2): Fix module structure for puppet 2.7 autoloader Fix broken string interpolation
recipes/aeolus/manifests/conductor.pp | 218 +------------------- .../aeolus/manifests/conductor/default_admin.pp | 17 ++ .../manifests/conductor/destroy_temp_admin.pp | 9 + recipes/aeolus/manifests/conductor/disabled.pp | 39 ++++ recipes/aeolus/manifests/conductor/hwp.pp | 24 +++ recipes/aeolus/manifests/conductor/login.pp | 19 ++ recipes/aeolus/manifests/conductor/logout.pp | 12 + recipes/aeolus/manifests/conductor/provider.pp | 18 ++ .../aeolus/manifests/conductor/provider/account.pp | 43 ++++ recipes/aeolus/manifests/conductor/site_admin.pp | 17 ++ recipes/aeolus/manifests/conductor/temp_admin.pp | 14 ++ recipes/aeolus/manifests/create_bucket.pp | 7 + recipes/aeolus/manifests/deltacloud.pp | 71 ------- recipes/aeolus/manifests/deltacloud/core.pp | 28 +++ recipes/aeolus/manifests/deltacloud/disabled.pp | 18 ++ recipes/aeolus/manifests/deltacloud/ec2.pp | 7 + recipes/aeolus/manifests/image-factory.pp | 35 --- recipes/aeolus/manifests/image-factory/disabled.pp | 13 ++ recipes/aeolus/manifests/image.pp | 22 ++ recipes/aeolus/manifests/init.pp | 13 -- recipes/aeolus/manifests/iwhd.pp | 32 --- recipes/aeolus/manifests/iwhd/disabled.pp | 22 ++ recipes/aeolus/manifests/profiles/rhevm.pp | 9 - .../aeolus/manifests/profiles/rhevm/disabled.pp | 3 + recipes/aeolus/manifests/rails.pp | 58 ----- recipes/aeolus/manifests/rails/create/db.pp | 8 + recipes/aeolus/manifests/rails/drop/db.pp | 8 + recipes/aeolus/manifests/rails/migrate/db.pp | 7 + recipes/aeolus/manifests/rails/seed/db.pp | 15 ++ recipes/aeolus/manifests/rhevm/validate.pp | 6 + recipes/aeolus/manifests/selinux.pp | 27 --- recipes/aeolus/manifests/selinux/mode.pp | 10 + recipes/apache/manifests/init.pp | 13 -- recipes/apache/manifests/site.pp | 13 ++ recipes/ntp/manifests/client.pp | 33 +++ recipes/ntp/manifests/init.pp | 35 --- recipes/ntp/manifests/server.pp | 2 + recipes/openssl/manifests/certificate.pp | 12 + recipes/openssl/manifests/init.pp | 33 --- recipes/openssl/manifests/key.pp | 19 ++ recipes/postgres/manifests/client.pp | 2 + recipes/postgres/manifests/init.pp | 51 ----- recipes/postgres/manifests/server.pp | 35 +++ recipes/postgres/manifests/user.pp | 14 ++ 44 files changed, 522 insertions(+), 589 deletions(-) create mode 100644 recipes/aeolus/manifests/conductor/default_admin.pp create mode 100644 recipes/aeolus/manifests/conductor/destroy_temp_admin.pp create mode 100644 recipes/aeolus/manifests/conductor/disabled.pp create mode 100644 recipes/aeolus/manifests/conductor/hwp.pp create mode 100644 recipes/aeolus/manifests/conductor/login.pp create mode 100644 recipes/aeolus/manifests/conductor/logout.pp create mode 100644 recipes/aeolus/manifests/conductor/provider.pp create mode 100644 recipes/aeolus/manifests/conductor/provider/account.pp create mode 100644 recipes/aeolus/manifests/conductor/site_admin.pp create mode 100644 recipes/aeolus/manifests/conductor/temp_admin.pp create mode 100644 recipes/aeolus/manifests/create_bucket.pp delete mode 100644 recipes/aeolus/manifests/deltacloud.pp create mode 100644 recipes/aeolus/manifests/deltacloud/core.pp create mode 100644 recipes/aeolus/manifests/deltacloud/disabled.pp create mode 100644 recipes/aeolus/manifests/deltacloud/ec2.pp create mode 100644 recipes/aeolus/manifests/image-factory/disabled.pp create mode 100644 recipes/aeolus/manifests/image.pp create mode 100644 recipes/aeolus/manifests/iwhd/disabled.pp create mode 100644 recipes/aeolus/manifests/profiles/rhevm/disabled.pp delete mode 100644 recipes/aeolus/manifests/rails.pp create mode 100644 recipes/aeolus/manifests/rails/create/db.pp create mode 100644 recipes/aeolus/manifests/rails/drop/db.pp create mode 100644 recipes/aeolus/manifests/rails/migrate/db.pp create mode 100644 recipes/aeolus/manifests/rails/seed/db.pp create mode 100644 recipes/aeolus/manifests/rhevm/validate.pp delete mode 100644 recipes/aeolus/manifests/selinux.pp create mode 100644 recipes/aeolus/manifests/selinux/mode.pp create mode 100644 recipes/apache/manifests/site.pp create mode 100644 recipes/ntp/manifests/client.pp create mode 100644 recipes/ntp/manifests/server.pp create mode 100644 recipes/openssl/manifests/certificate.pp create mode 100644 recipes/openssl/manifests/key.pp create mode 100644 recipes/postgres/manifests/client.pp create mode 100644 recipes/postgres/manifests/server.pp create mode 100644 recipes/postgres/manifests/user.pp
On 28/05/2012, at 11:02 PM, Mo Morsi wrote:
Hrm, one thing that I don't like about these pull requests is that it makes it tricky to comment of specific bits of code in the review. With the send-patches-to-list approach, I can comment inline on specifics.
As an info point, you can add comments directly to lines for GitHub pull requests.
When you mouseover a code line in a pull request, a blue + icon will show up on that line. Click directly on that icon, then wait a second. A new comment box will open up directly under the line.
(note, if you click elsewhere on the line, not quite on the blue + icon itself, you'll get a different result. Seems to open a comment box at the very bottom of the code, instead of for the specific line) also lets you click
+ Justin
-- Aeolus Community Manager http://www.aeolusproject.org
On Mon, 28 May 2012 15:02:21 +0200, Mo Morsi mmorsi@redhat.com wrote:
Hrm, one thing that I don't like about these pull requests is that it makes it tricky to comment of specific bits of code in the review. With the send-patches-to-list approach, I can comment inline on specifics.
Agreed. I mainly did it this way because the changeset was so large, that (1) sending that much diff in email is a bit excessive, imo, and (2) I was seeing some issues where the patches were getting mangled and would not apply properly. Possibly due to file renames and the fuzzy logic surrounding them. I didn't look too much into it.
Regardless, a few notes:
1 - in the original patchset you mentioned that there was a prerequisite patch needed ("Various test and rake fixes for F17 compatibility") to build the rpms. I couldn't find this on the list (did I miss it?)
https://fedorahosted.org/pipermail/aeolus-devel/2012-May/010429.html
2 - I noticed in this patchset some modules were placed under the 'aeolus' namespace (eg the rails and rhevm config) while some modules were placed at the top level (eg the apache, ntp, openssl, postgres config). Was there a reason for this distinction?
I intentionally didn't move any code across modules. That sort of reorganization is definitely needed, but I didn't want to creep too far from the goal of "get these modules to run under 2.7". I think selinux was the only other place this was applicable, for future reference.
3 - for the rails db manifests, I'd rather switch the ordering so that 'db' is the folder which contains puppet modules for 'drop', 'seed', 'create', 'migrate'. I'd be fine w/ including this change in a follow-on patch though
Agreed, this makes more sense. This is another instance of changing the minimal amount to get it working. (In fact this is just the direct result of running the automation script I wrote; it just puts it where it "belongs" without regard to semantics.)
4 - on F17 with this patch set applied I get 'warning: Could not retrieve fact ipaddress', the default configure invocation seems to run successfully so am not sure if this affects anything or not (perhaps in a profile which I did not use?)
That's almost certainly a facter bug. We don't use that fact presently, so that's not a big deal for us.
After I pull your changes in I was able to build and install an update aeolus-configure rpm on F17. The default invocation of configure didn't seem to run successfully though (tried a few times to no avail) but I'm not sure if this is due to an issue w/ configure or issues w/ the various components being configured on F17. Regardless these patches gets us closer to where we need to be so this is not a blocker.
I was seeing this too, it seems to be more a problem of the individual components. Specifically, I was seeing some weird behavior with the deltacloud-core sysv-style init script under systemd that was cascading and causing everything else to fail. I changed it to run as a systemd service unit and it worked fine after that, which is a good reminder that I need to sync up with the deltacloud folks and get that remedied.
Invoking the updated configure on F16 works as it did before (I just tried a few times w/ the default profile) so ACK provided this patchset doesn't entail any functional changes, just reorganizing things. (conductor-delayed_job did fail to start, but this was the same when I tried starting it manually via the command line)
-Mo
Cool. I'm going to hold off on pushing this until the aforementioned "Various test and rake fixes for F17 compatibility" patches are reviewed. Once those are ACKed I'll push both at the same time.
Thanks for looking at this Mo!
Invoking the updated configure on F16 works as it did before (I just tried a few times w/ the default profile) so ACK provided this patchset doesn't entail any functional changes, just reorganizing things. (conductor-delayed_job did fail to start, but this was the same when I tried starting it manually via the command line)
-Mo
Cool. I'm going to hold off on pushing this until the aforementioned "Various test and rake fixes for F17 compatibility" patches are reviewed. Once those are ACKed I'll push both at the same time.
Thanks for looking at this Mo!
Looks like Richard ack'd your patches last week, so feel free to push away
https://fedorahosted.org/pipermail/aeolus-devel/2012-June/010649.html
-Mo
On Tue, 05 Jun 2012 11:03:28 +0200, Mo Morsi mmorsi@redhat.com wrote:
Invoking the updated configure on F16 works as it did before (I just tried a few times w/ the default profile) so ACK provided this patchset doesn't entail any functional changes, just reorganizing things. (conductor-delayed_job did fail to start, but this was the same when I tried starting it manually via the command line)
-Mo
Cool. I'm going to hold off on pushing this until the aforementioned "Various test and rake fixes for F17 compatibility" patches are reviewed. Once those are ACKed I'll push both at the same time.
Thanks for looking at this Mo!
Looks like Richard ack'd your patches last week, so feel free to push away
https://fedorahosted.org/pipermail/aeolus-devel/2012-June/010649.html
-Mo
Aye, I pushed the whole bunch at the end of Friday, I just forgot to update the list noting it.
aeolus-devel@lists.fedorahosted.org