diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2015-03-23 23:53:17 -0400 | 
|---|---|---|
| committer | Jason DeTiberus <jdetiber@redhat.com> | 2015-04-03 14:51:26 -0400 | 
| commit | 4712e72c912a1102bff0508c98bd97da3f33ae95 (patch) | |
| tree | 04a2bfebd3ac8b746150921bd134dbde70a9a56a /playbooks/gce/openshift-cluster | |
| parent | 59e69dd21c19bf745392b5e83bd652630ee870cc (diff) | |
openshift_facts role/module refactor default settings
- Add openshift_facts role and module
  - Created new role openshift_facts that contains an openshift_facts module
  - Refactor openshift_* roles to use openshift_facts instead of relying on
    defaults
  - Refactor playbooks to use openshift_facts
  - Cleanup inventory group_vars
- Update defaults
  - update openshift_master role firewall defaults
    - remove etcd peer port, since we will not be supporting clustered embedded
      etcd
    - remove 8444 since console now runs on the api port by default
    - add 8444 and 7001 to disabled services to ensure removal if updating
- Add new role os_env_extras_node that is a subset of the docker role
  - previously, we were starting/enabling docker which was causing issues with some
  installations
  - Does not install or start docker, since the openshift-node role will
    handle that for us
  - Only adds root to the dockerroot group
  - Update playbooks to use ops_env_extras_node role instead of docker role
- os_firewall bug fixes
  - ignore ip6tables for now, since we are not configuring any ipv6 rules
  - if installing package do a daemon-reload before starting/enabling service
- Add aws support to bin/cluster
- Add list action to bin/cluster
- Add update action to bin/cluster
- cleanup some stray debug statements
- some variable renaming for clarity
Diffstat (limited to 'playbooks/gce/openshift-cluster')
| -rw-r--r-- | playbooks/gce/openshift-cluster/launch.yml | 9 | ||||
| -rw-r--r-- | playbooks/gce/openshift-cluster/launch_instances.yml | 7 | ||||
| -rw-r--r-- | playbooks/gce/openshift-cluster/list.yml | 17 | ||||
| -rw-r--r-- | playbooks/gce/openshift-cluster/update.yml | 13 | 
4 files changed, 40 insertions, 6 deletions
| diff --git a/playbooks/gce/openshift-cluster/launch.yml b/playbooks/gce/openshift-cluster/launch.yml index 889d92d40..14cdd2537 100644 --- a/playbooks/gce/openshift-cluster/launch.yml +++ b/playbooks/gce/openshift-cluster/launch.yml @@ -11,7 +11,7 @@      - name: Generate master instance names(s)        set_fact: scratch={{ cluster_id }}-{{ k8s_type }}-{{ '%05x' |format( 1048576 |random) }}        register: master_names_output -      with_sequence: start=1 end={{ masters }} +      with_sequence: start=1 end={{ num_masters }}      # These set_fact's cannot be combined      - set_fact: @@ -25,14 +25,13 @@          instances: "{{ master_names }}"          cluster: "{{ cluster_id }}"          type: "{{ k8s_type }}" -        group_name: "tag_env-host-type-{{ cluster_id }}-openshift-master"      - set_fact: k8s_type="node"      - name: Generate node instance names(s)        set_fact: scratch={{ cluster_id }}-{{ k8s_type }}-{{ '%05x' |format( 1048576 |random) }}        register: node_names_output -      with_sequence: start=1 end={{ nodes }} +      with_sequence: start=1 end={{ num_nodes }}      # These set_fact's cannot be combined      - set_fact: @@ -55,9 +54,9 @@  - include: ../openshift-master/config.yml    vars:      oo_host_group_exp: "groups[\"tag_env-host-type-{{ cluster_id }}-openshift-master\"]" -    oo_env: "{{ cluster_id }}"  - include: ../openshift-node/config.yml    vars:      oo_host_group_exp: "groups[\"tag_env-host-type-{{ cluster_id }}-openshift-node\"]" -    oo_env: "{{ cluster_id }}" + +- include: list.yml diff --git a/playbooks/gce/openshift-cluster/launch_instances.yml b/playbooks/gce/openshift-cluster/launch_instances.yml index 20e31d990..b4f33bd87 100644 --- a/playbooks/gce/openshift-cluster/launch_instances.yml +++ b/playbooks/gce/openshift-cluster/launch_instances.yml @@ -1,3 +1,7 @@ +--- +# TODO: when we are ready to go to ansible 1.9+ support only, we can update to +# the gce task to use the disk_auto_delete parameter to avoid having to delete +# the disk as a separate step on termination  - set_fact:      machine_type: "{{ lookup('env', 'gce_machine_type') |default('n1-standard-1', true) }}" @@ -18,12 +22,13 @@        - "env-host-type-{{ cluster }}-openshift-{{ type }}"    register: gce -- name: Add new instances public IPs +- name: Add new instances to groups and set variables needed    add_host:      hostname: "{{ item.name }}"      ansible_ssh_host: "{{ item.public_ip }}"      groups: "{{ item.tags | oo_prepend_strings_in_list('tag_') | join(',') }}"      gce_public_ip: "{{ item.public_ip }}" +    gce_private_ip: "{{ item.private_ip }}"    with_items: gce.instance_data  - name: Wait for ssh diff --git a/playbooks/gce/openshift-cluster/list.yml b/playbooks/gce/openshift-cluster/list.yml new file mode 100644 index 000000000..1124b0ea3 --- /dev/null +++ b/playbooks/gce/openshift-cluster/list.yml @@ -0,0 +1,17 @@ +--- +- name: Generate oo_list_hosts group +  hosts: localhost +  gather_facts: no +  tasks: +  - set_fact: scratch_group=tag_env-{{ cluster_id }} +    when: cluster_id != '' +  - set_fact: scratch_group=all +    when: scratch_group is not defined +  - add_host: name={{ item }} groups=oo_list_hosts +    with_items: groups[scratch_group] | difference(['localhost']) | difference(groups.status_terminated) + +- name: List Hosts +  hosts: oo_list_hosts +  gather_facts: no +  tasks: +  - debug: msg="public:{{hostvars[inventory_hostname].gce_public_ip}} private:{{hostvars[inventory_hostname].gce_private_ip}}" diff --git a/playbooks/gce/openshift-cluster/update.yml b/playbooks/gce/openshift-cluster/update.yml new file mode 100644 index 000000000..973e4c3ef --- /dev/null +++ b/playbooks/gce/openshift-cluster/update.yml @@ -0,0 +1,13 @@ +--- +- hosts: "tag_env-{{ cluster_id }}" +  roles: +  - openshift_repos +  - os_update_latest + +- include: ../openshift-master/config.yml +  vars: +    oo_host_group_exp: "groups[\"tag_env-host-type-{{ cluster_id }}-openshift-master\"]" + +- include: ../openshift-node/config.yml +  vars: +    oo_host_group_exp: "groups[\"tag_env-host-type-{{ cluster_id }}-openshift-node\"]" | 
