Skip to content

Fixed GCE playbooks so that they're more like the AWS playbooks.#688

Merged
twiest merged 1 commit intoopenshift:masterfrom
twiest:gce
Oct 14, 2015
Merged

Fixed GCE playbooks so that they're more like the AWS playbooks.#688
twiest merged 1 commit intoopenshift:masterfrom
twiest:gce

Conversation

@twiest
Copy link
Contributor

@twiest twiest commented Oct 12, 2015

Namely the GCE playbooks now:

  • Create infra nodes
  • Correctly label nodes in OpenShift
  • Setup masters as nodes as well (needed for sdn)
  • Removed set_infra_launch_facts_tasks.yml as it's not used anymore.

@twiest
Copy link
Contributor Author

twiest commented Oct 12, 2015

@menren @sdodson Hey Guys, mind looking at this please?

It should only affect GCE, and I tested it using the online deployment type against GCE and everything is working well for me.

@menren This is the code that enables infra nodes that I talked about in PR #658. Please make sure this doesn't break you. This is meant to make the GCE code work more like the AWS code.

Copy link
Member

Choose a reason for hiding this comment

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

Remove the debug?

@chengchengmu
Copy link
Contributor

As I mentionned, we need to do some check in the case we deploy without infra-node.

It seems good to me with infra-node :

PLAY RECAP ******************************************************************** 
github-master-8fc35        : ok=173  changed=56   unreachable=0    failed=0   
github-node-compute-91dfe  : ok=61   changed=24   unreachable=0    failed=0   
github-node-compute-bb1fb  : ok=61   changed=24   unreachable=0    failed=0   
github-node-infra-25513    : ok=61   changed=24   unreachable=0    failed=0   
localhost                  : ok=49   changed=6    unreachable=0    failed=0  

@twiest
Copy link
Contributor Author

twiest commented Oct 14, 2015

@menren @sdodson Please review again, I've addressed all comments.

@menren please also make sure it doesn't break you.

I also tested with and without infra nodes.

With infra nodes:

PLAY RECAP ******************************************************************** 
localhost                  : ok=43   changed=6    unreachable=0    failed=0   
twiesttest2-master-ff011   : ok=166  changed=56   unreachable=0    failed=0   
twiesttest2-node-compute-34b42 : ok=61   changed=24   unreachable=0    failed=0   
twiesttest2-node-infra-9cbf6 : ok=61   changed=24   unreachable=0    failed=0   

Without infra nodes:

PLAY RECAP ******************************************************************** 
localhost                  : ok=37   changed=4    unreachable=0    failed=0   
twiesttest3-master-ac34a   : ok=166  changed=56   unreachable=0    failed=0   
twiesttest3-node-compute-ba3c1 : ok=61   changed=24   unreachable=0    failed=0   

Namely the GCE playbooks now:
- Create infra nodes
- Correctly label nodes in OpenShift
- Setup masters as nodes as well (needed for sdn)
- Removed set_infra_launch_facts_tasks.yml as it's not used anymore.
@chengchengmu
Copy link
Contributor

Good for me !

@sdodson
Copy link
Member

sdodson commented Oct 14, 2015

LGTM

twiest added a commit that referenced this pull request Oct 14, 2015
Fixed GCE playbooks so that they're more like the AWS playbooks.
@twiest twiest merged commit b9fb83e into openshift:master Oct 14, 2015
@twiest twiest deleted the gce branch October 14, 2015 15:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants