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

* helper_functions.py --> set ETCD to a warning only if it is not a m… #248

Merged
merged 3 commits into from
Apr 6, 2017

Conversation

stratus-ss
Copy link
Contributor

What does this PR do?

This addresses #245

  • validate-pre-install.py --> added hashes for different versions of docker
  • validate-pre-install.py --> added check to see if ETCD is a partition
  • validate-pre-install.py --> added flags for 'private-registry'

How should this be manually tested?

./validate_pre-install.py` --ansible-host-file=/etc/ansible/hosts --show-sha-sums=yes --ansible-ssh-user=root --openshift-version=3.3 --private-registry

The --private-registry is optional. If it is not set, the script does not check the sum of /etc/sysconfig/docker anymore as it is no longer necessary to modify this file by hand in the default configuration

Who would you like to review this?

/cc @etsauer @oybed

…ount point

* validate-pre-install.py --> added hashes for different versions of docker
* validate-pre-install.py --> added check to see if ETCD is a partition
* validate-pre-install.py --> added flags for 'private-registry'
Copy link
Contributor

@etsauer etsauer left a comment

Choose a reason for hiding this comment

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

Just one comment from my pov

openshift_server_repo = "rhel-7-server-ose-3.2-rpms"
elif "3.1" in options.openshift_version:
openshift_server_repo = "rhel-7-server-ose-3.1-rpms"
elif "3.3" in options.openshift_version:
Copy link
Contributor

Choose a reason for hiding this comment

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

can we add in 3.4 (and 3.5 while we're at it)?

Copy link
Contributor

Choose a reason for hiding this comment

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

@etsauer do we want to just remove the version check and just have it apply what the user provides? Makes maintainability easier instead of having to update scripts. It will fail down the line anyways if it is incorrect

Copy link
Contributor Author

Choose a reason for hiding this comment

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

we can, but sanitation becomes a problem. The current method, crude though it may be, provides a level of sanitation that would have to be rethought if we are just taking whatever the user passes in

Copy link
Contributor

Choose a reason for hiding this comment

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

since that functionality is just used to validate the the repositories that are configured on the host, is there a major concern with making it a passthrough. Unless we perform a simple regex (x.x)

Copy link
Contributor

Choose a reason for hiding this comment

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

I think a regex validation of the option would be the ideal case... I would also (for now) restrict it to a format of "3.x"

Copy link
Contributor

Choose a reason for hiding this comment

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

we can push this to a future PR.

@etsauer
Copy link
Contributor

etsauer commented Apr 5, 2017

@sabre1041 go ahead and do your review, and then merge if you want.

* added option to check for selinux booleans
* updated to now specify different file hashes depending on the version of docker
* Changed the output headings for better readability
Copy link
Contributor

@sabre1041 sabre1041 left a comment

Choose a reason for hiding this comment

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

Looks good to me

@sabre1041 sabre1041 merged commit 89eacd3 into rhtconsulting:openshift-enterprise-3 Apr 6, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants