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

Add in rhel and windows FIPS override #1124

Merged
merged 2 commits into from
Jan 19, 2017

Conversation

rmoshier
Copy link
Contributor

@rmoshier rmoshier commented Dec 22, 2016

Description

On rhel and windows include the OpenSSL FIPS module into the ChefDK. The FIPS module is not activated unless users activate it.

Issues Resolved

N/A

Check List

@rmoshier rmoshier force-pushed the bp-439/rhel-windows-fips-chefdk branch 3 times, most recently from d8c8d94 to 6a7a661 Compare December 23, 2016 18:14
@tylercloke
Copy link
Contributor

Worth noting that this work depending on this merging first.

@rmoshier rmoshier force-pushed the bp-439/rhel-windows-fips-chefdk branch 2 times, most recently from 8bed168 to c0d6f37 Compare December 23, 2016 21:17
@tyler-ball tyler-ball force-pushed the bp-439/rhel-windows-fips-chefdk branch 2 times, most recently from bebf92b to b3c9133 Compare January 3, 2017 23:12
@tyler-ball tyler-ball force-pushed the bp-439/rhel-windows-fips-chefdk branch 3 times, most recently from 0fe83a8 to 069b2bd Compare January 18, 2017 19:47
Copy link

@dmccown dmccown left a comment

Choose a reason for hiding this comment

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

LGTM


# TODO Pinning these for now because github_changelog_generator has a bunch
# of different versions across our products
gem "nokogiri", "~> 1.6.3"
Copy link

Choose a reason for hiding this comment

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

@tduffield Have you all mitigated the dependency breakage? Would you like this in a different PR?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yup! We're going to get this merged since it got a green build and deal with the problem dependencies in another PR

Copy link

@dmccown dmccown left a comment

Choose a reason for hiding this comment

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

We need to rebase the commits and make sure they are all DCO signed.

@tyler-ball
Copy link
Contributor

🚧 until we figure out what to do about the dependencies

rmoshier and others added 2 commits January 19, 2017 12:24
Also update our omnibus config to use the new fips flags getting
exposed.

Signed-off-by: Rachel Adler <radler@chef.io>
Signed-off-by: tyler-ball <tyleraball@gmail.com>
Signed-off-by: tyler-ball <tyleraball@gmail.com>
@tyler-ball tyler-ball force-pushed the bp-439/rhel-windows-fips-chefdk branch from 37b4c97 to 918723a Compare January 19, 2017 18:24
@tyler-ball
Copy link
Contributor

This is ready for final review and merging!

@tyler-ball tyler-ball merged commit b1c6365 into master Jan 19, 2017
@tyler-ball tyler-ball deleted the bp-439/rhel-windows-fips-chefdk branch January 19, 2017 18:53
@thommay thommay added Type: Enhancement Adds new functionality. and removed Enhancement labels Feb 1, 2017
@chef-boneyard chef-boneyard locked and limited conversation to collaborators Feb 14, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Type: Enhancement Adds new functionality.
Development

Successfully merging this pull request may close these issues.

7 participants