Making providers common by cooktheryan · Pull Request #126 · openshift/openshift-ansible-contrib

cooktheryan · 2016-11-22T15:29:22Z

I will need testing done from @dav1x @themurph and/or @pschiffe

This is the first big chunk of work to make the providers common this should benefit OSP and Azure in the future and ensure that a change made on one common role is applied to all groups.

detiber · 2016-11-22T15:36:12Z

reference-architecture/common/README.md

@@ -0,0 +1,2 @@
+# The Reference Architecture Common Playbooks and Roles


Why not move these to the root of the repo?

playbooks/
roles/

ahhh interesting. I had not thought about that. Let me move some pieces around

cooktheryan · 2016-11-22T15:52:49Z

Use common roles that all providers can use

detiber · 2016-11-22T17:18:19Z

playbooks/empty-dir-quota.yaml

+  vars_files:
+    - vars/main.yaml
+  roles:
+      - ../roles/openshift-emptydir-quota


will probably be better to add a symlink to ../roles in the playbooks directory rather than reference the role this way.

detiber · 2016-11-22T17:21:36Z

playbooks/empty-dir-quota.yaml

+  gather_facts: yes
+  become: yes
+  vars_files:
+    - vars/main.yaml


vars_files may be problematic, I would suggest that required settings be passed in for generic playbooks.

Should be able to just remove them as it doesn't appear that the vars matter in regards to the play

cooktheryan · 2016-11-22T19:10:09Z

Both atomic containerized and RHEL install are good on AWS

scollier · 2016-12-08T16:51:59Z

aos-ci-test

openshift-bot · 2016-12-08T17:20:57Z

e61e1fe - State: error - All Test Contexts: aos-ci-jenkins/openshift-ansible-contrib-validate - Logs: https://aos-ci.s3.amazonaws.com/openshift/openshift-ansible-contrib/jenkins-e2e-openshift-on-aws-pr-2-test-matrix-nodes=openshift-ose-aws-slave-2/e61e1feeed84696dd3bd2a55f4c450ced24e9380.txt

detiber · 2016-12-08T19:23:14Z

playbooks/validation.yaml

@@ -15,7 +15,7 @@
      - validate-etcd


I think this playbook should be called post-validation and not validation.

detiber · 2016-12-08T19:56:33Z

roles/rhsm-repos/tasks/main.yaml

@@ -0,0 +1,38 @@
+---
+- name: disable unneeded repos
+  command: subscription-manager repos --disable='*'


There should probably be a prior step to determine what repos are currently enabled and only disable/enable when needed. Examples below shows what I mean as well as moving the conditional around:

- name: Example playbooks hosts: example_hosts roles: - role: rhsm-repos when: "{{ ansible_distribution == 'RedHat' and openshift_manage_repos is true }}"

# a bit handwavy, since this output needs to be filtered, or a diff command used, but this example assumes that the output here is just a bare list of repos enabled - command: subscription-manager repos --list-enabled register: subscription_manager_repos changed_when: false - block: - name: disable repos command: "subscription-manager{{ ' --disable='.join(repos_to_remove) + ' --enable'.join(repos_to_add)}}" when: "{{ repos_to_remove | length > 0 or repos_to_add | length > 0 }}" vars: repo_list: - rhel-7-server-rpms - rhel-7-server-extras-rpms - rhel-7-server-ose-3.3-rpms repos_to_remove: "{{ subscription_manager_repos | difference(repo_list) }}" repos_to_add: "{{ repo_list | difference(subscription_manager_repos) }}" ....

detiber · 2016-12-08T19:57:49Z

roles/rhsm-subscription/tasks/main.yaml

    pool: "{{ rhsm_pool }}"
  when: "'Subscribed' not in subscribed.stdout and rhsm_activation_key is defined and rhsm_activation_key != 'None'"
-  register: register_key_result
+  register: register_key_result and ansible_distribution == "RedHat"


I'd move the ansible_distribution == "RedHat" either to a conditional on a block that contains all the tasks, or move it into a conditional on the role in the playbook.

I'm really digging this whole bock idea

Blocks are awesome. Allowing for the conditionals to be applied in one place is nice, but setting vars at the block-scope is even better :)

cooktheryan · 2016-12-09T21:36:58Z

@detiber went block crazy and verified with both centos/origin and rhel/ocp. Will look into the repos enable/disable next week

cooktheryan · 2016-12-14T19:00:19Z

@detiber I can't get manage to create a sane output from the disable/enable play. Using the above prints everything but the stdout_lines when trying to parse the var down to use stdout_lines there are still too many extra items. Below is the output of stdout_lines

    "subscription_manager_repos.stdout_lines": [
        "+----------------------------------------------------------+", 
        "    Available Repositories in /etc/yum.repos.d/redhat.repo", 
        "+----------------------------------------------------------+", 
        "Repo ID:   rhel-7-fast-datapath-htb-rpms", 
        "Repo Name: Red Hat Enterprise Linux Fast Datapath Beta (RHEL 7 Server) (RPMs)", 
        "Repo URL:  https://cdn.redhat.com/content/htb/rhel/server/7/$basearch/fast-datapath/os", 
        "Enabled:   1", 
        "", 
        "Repo ID:   rhel-7-server-rpms", 
        "Repo Name: Red Hat Enterprise Linux 7 Server (RPMs)", 
        "Repo URL:  https://cdn.redhat.com/content/dist/rhel/server/7/$releasever/$basearch/os", 
        "Enabled:   1", 
        "", 
        "Repo ID:   rhel-7-fast-datapath-rpms", 
        "Repo Name: Red Hat Enterprise Linux Fast Datapath (RHEL 7 Server) (RPMs)", 
        "Repo URL:  https://cdn.redhat.com/content/dist/rhel/server/7/$releasever/$basearch/fast-datapath/os", 
        "Enabled:   1"
    ]

Any input appreciated just not sure how to parse or what to parse.

cooktheryan · 2016-12-14T22:01:13Z

@dav1x @themurph @pschiffe can I get you guys to test this now that the code blocks are in place?

dav1x · 2016-12-14T23:14:19Z

@cooktheryan ill try and pull down tomorrow and test a deploy on my environment

dav1x · 2017-01-09T22:13:39Z

@cooktheryan tested and works great. excited to get it going after the INI changes.

cooktheryan · 2017-01-12T19:04:25Z

GCE Validation

PLAY RECAP *********************************************************************
localhost : ok=23 changed=16 unreachable=0 failed=0
ocp-infra-dskl : ok=173 changed=53 unreachable=0 failed=0
ocp-infra-pn6h : ok=173 changed=53 unreachable=0 failed=0
ocp-master-nwjn : ok=542 changed=180 unreachable=0 failed=0
ocp-master-r97j : ok=351 changed=122 unreachable=0 failed=0
ocp-master-s14k : ok=351 changed=122 unreachable=0 failed=0
ocp-node-2z9x : ok=166 changed=56 unreachable=0 failed=0
ocp-node-p6cl : ok=166 changed=56 unreachable=0 failed=0

Connection to 35.185.27.235 closed.

Deployment is complete. OpenShift Console can be found at https://master.gce-validate.sysdeseng.com

DanyC97 · 2017-01-12T22:11:29Z

hi all, over last week i've been working on getting OS Origin on CentOS running on VMware. Through that process i found few issues....

Looking at this chunk it sounds i should better hold pushing any PRs, how far you guys think this PR is from being merged?

cooktheryan · 2017-01-12T22:13:05Z

Looking at tomorrow/monday for merging. We just need to run it through the providers 1 last time before merging.

…

On Thu, Jan 12, 2017 at 5:11 PM, Dani Comnea ***@***.***> wrote: hi all, over last week i've been working on getting OS Origin on CentOS running on VMware. Through that process i found few issues.... Looking at this chunk it sounds i should better hold pushing any PRs, how far you guys think this PR is from being merged? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#126 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ADoslHk71pY2ZQszFRZsZKAqo7ICNsIKks5rRqUSgaJpZM4K5kfq> .

DanyC97 · 2017-01-12T23:18:44Z

@cooktheryan perfect, thanks for quick response 👍

dav1x · 2017-01-13T15:13:52Z

@DanyC97 hey man. I did a lot of work on VMware as a provider ping me if I can help with your CentOS deploy

DanyC97 · 2017-01-15T20:44:09Z

@dav1x thanks you for the offer, definitely i'll need your help 👍

so my confusion comes from few things:

the req for atomic-openshift-utils rpm is not found on CentOS repo hence the playbook fails

I'll go tomorrow to try and redeploy from scratch using CentOS on VMware and latest changes you guys done so i can validate it.

* Making providers common * moving directory locations * using links and removal of vars file callout * rename of file * went block crazy * cleanup * add to remove * missing Pyyaml package in README * let docker actually setup docker storage and start the service * name change * Fix for vmware. Will variablize in the future * catchup to test common providers against master * should only be schedulable nodes

Making providers common

d6600df

detiber reviewed Nov 22, 2016

View reviewed changes

moving directory locations

cbeb117

cooktheryan assigned themurph, pschiffe and dav1x Nov 22, 2016

detiber reviewed Nov 22, 2016

View reviewed changes

using links and removal of vars file callout

e61e1fe

detiber reviewed Dec 8, 2016

View reviewed changes

cooktheryan added 2 commits December 8, 2016 16:51

rename of file

ae021ba

went block crazy

4dc7191

cleanup

91e1717

cooktheryan mentioned this pull request Dec 15, 2016

Initial Push of Azure Ansible Ref Arch Tempaltes #125

Merged

pschiffe added aws gcp vmware labels Jan 5, 2017

add to remove

e9a1700

cooktheryan added 4 commits January 10, 2017 13:11

missing Pyyaml package in README

584b662

let docker actually setup docker storage and start the service

3e506f8

name change

ec55881

Fix for vmware. Will variablize in the future

95ae973

cooktheryan added 2 commits January 12, 2017 13:15

catchup to test common providers against master

aaf95d9

should only be schedulable nodes

7371383

Merge branch 'master' into common-providers

2e90635

cooktheryan merged commit a30e0f4 into openshift:master Jan 13, 2017

		@@ -0,0 +1,2 @@
		# The Reference Architecture Common Playbooks and Roles

Conversation

cooktheryan commented Nov 22, 2016

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cooktheryan commented Nov 22, 2016

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cooktheryan Nov 22, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cooktheryan commented Nov 22, 2016

Uh oh!

scollier commented Dec 8, 2016

Uh oh!

openshift-bot commented Dec 8, 2016

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cooktheryan commented Dec 9, 2016

Uh oh!

cooktheryan commented Dec 14, 2016

Uh oh!

cooktheryan commented Dec 14, 2016

Uh oh!

dav1x commented Dec 14, 2016

Uh oh!

dav1x commented Jan 9, 2017

Uh oh!

cooktheryan commented Jan 12, 2017

Uh oh!

DanyC97 commented Jan 12, 2017

Uh oh!

cooktheryan commented Jan 12, 2017 via email

Uh oh!

DanyC97 commented Jan 12, 2017

Uh oh!

dav1x commented Jan 13, 2017

Uh oh!

DanyC97 commented Jan 15, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

cooktheryan Nov 22, 2016 •

edited

Loading

DanyC97 commented Jan 15, 2017 •

edited

Loading