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

Alter embedded ansible for rpm builds #14637

Merged

Conversation

carbonin
Copy link
Member

@carbonin carbonin commented Apr 4, 2017

This PR allows our Embedded Ansible role to work with the new RPM installed packages.

We move away from checking for the setup script in /opt/ansible-installer and use the files provided for us by the RPM.

This PR also includes changes to account for the UI not being present when the setup script is run.

This wrapper script is provided in /usr/bin by the rpm rather than
installed in a path by us manually.
This extra variable tells the setup script that it shouldn't
attempt to set up the various files needed to run the tower UI.
Copy link
Member

@gtanzillo gtanzillo left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@miq-bot
Copy link
Member

miq-bot commented Apr 4, 2017

Checked commits carbonin/manageiq@9984f38~...e47eafb with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0
2 files checked, 0 offenses detected
Everything looks good. 🍪

installed_rpms = {
"ansible-tower-server" => "1.0.1",
"ansible-tower-setup" => "1.2.3",
"vim" => "13.5.1"
Copy link
Member

Choose a reason for hiding this comment

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

lol, vim

@jrafanie
Copy link
Member

jrafanie commented Apr 4, 2017

Looks good to me! 😎 👍

@jrafanie jrafanie merged commit cb39482 into ManageIQ:master Apr 4, 2017
@jrafanie jrafanie added this to the Sprint 58 Ending Apr 10, 2017 milestone Apr 4, 2017
simaishi pushed a commit that referenced this pull request Apr 7, 2017
…m_builds

Alter embedded ansible for rpm builds
(cherry picked from commit cb39482)
@simaishi
Copy link
Contributor

simaishi commented Apr 7, 2017

Fine backport details:

$ git log -1
commit b3dee8f14bb2274ad3c3cb63a2ae5e06a290262e
Author: Joe Rafaniello <jrafanie@users.noreply.github.com>
Date:   Tue Apr 4 17:06:56 2017 -0400

    Merge pull request #14637 from carbonin/alter_embedded_ansible_for_rpm_builds
    
    Alter embedded ansible for rpm builds
    (cherry picked from commit cb394825c9ad77e1b32969edb73841b31460e78b)

@carbonin carbonin deleted the alter_embedded_ansible_for_rpm_builds branch May 18, 2017 17:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants