diff options
| author | Jhon Honce <jhonce@redhat.com> | 2015-02-17 10:43:19 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2015-02-17 10:43:19 -0700 |
| commit | bcb257a6a68cf907afeb547e34d456f0351b45c2 (patch) | |
| tree | a3a44c587779312aef8f0b28cb847a84b1f03b92 /playbooks/aws | |
| parent | 9fed3621012fa21e87e46c704904895bf26cfa1f (diff) | |
| parent | aa6c548d4bae31526e22116967d730f6ecb528c0 (diff) | |
| download | openshift-bcb257a6a68cf907afeb547e34d456f0351b45c2.tar.gz openshift-bcb257a6a68cf907afeb547e34d456f0351b45c2.tar.bz2 openshift-bcb257a6a68cf907afeb547e34d456f0351b45c2.tar.xz openshift-bcb257a6a68cf907afeb547e34d456f0351b45c2.zip | |
Merge pull request #61 from jwhonce/wip/kubeconfig
Update playbooks for latest origin code
Diffstat (limited to 'playbooks/aws')
| -rw-r--r-- | playbooks/aws/openshift-master/config.yml | 14 | ||||
| -rw-r--r-- | playbooks/aws/openshift-node/config.yml (renamed from playbooks/aws/openshift-minion/config.yml) | 2 | ||||
| -rw-r--r-- | playbooks/aws/openshift-node/launch.yml (renamed from playbooks/aws/openshift-minion/launch.yml) | 0 | ||||
| -rw-r--r-- | playbooks/aws/openshift-node/vars.yml (renamed from playbooks/aws/openshift-minion/vars.yml) | 0 |
4 files changed, 8 insertions, 8 deletions
diff --git a/playbooks/aws/openshift-master/config.yml b/playbooks/aws/openshift-master/config.yml index c8345aa2c..8a5873189 100644 --- a/playbooks/aws/openshift-master/config.yml +++ b/playbooks/aws/openshift-master/config.yml @@ -7,8 +7,8 @@ with_items: "{{ oo_host_group_exp | default('') }}" when: oo_host_group_exp is defined -- name: "Gather facts for minions in {{ oo_env }}" - hosts: "tag_env-host-type_{{ oo_env }}-openshift-minion" +- name: "Gather facts for nodes in {{ oo_env }}" + hosts: "tag_env-host-type_{{ oo_env }}-openshift-node" connection: ssh user: root @@ -16,12 +16,12 @@ hosts: localhost gather_facts: no tasks: - - name: Setting oo_minion_ips fact on localhost + - name: Setting oo_node_ips fact on localhost set_fact: - oo_minion_ips: "{{ hostvars - | oo_select_keys(groups['tag_env-host-type_' + oo_env + '-openshift-minion']) + oo_node_ips: "{{ hostvars + | oo_select_keys(groups['tag_env-host-type_' + oo_env + '-openshift-node']) | oo_collect(attribute='ansible_eth0.ipv4.address') }}" - when: groups['tag_env-host-type_' + oo_env + '-openshift-minion'] is defined + when: groups['tag_env-host-type_' + oo_env + '-openshift-node'] is defined - name: "Configure instances" hosts: oo_hosts_to_config @@ -34,7 +34,7 @@ - ../../../roles/repos - { role: ../../../roles/openshift_master, - oo_minion_ips: "{{ hostvars['localhost'].oo_minion_ips | default(['']) }}", + oo_node_ips: "{{ hostvars['localhost'].oo_node_ips | default(['']) }}", oo_bind_ip: "{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address | default(['']) }}" } - ../../../roles/pods diff --git a/playbooks/aws/openshift-minion/config.yml b/playbooks/aws/openshift-node/config.yml index b59ba5a9b..2170f14a3 100644 --- a/playbooks/aws/openshift-minion/config.yml +++ b/playbooks/aws/openshift-node/config.yml @@ -34,7 +34,7 @@ - ../../../roles/repos - ../../../roles/docker - { - role: ../../../roles/openshift_minion, + role: ../../../roles/openshift_node, oo_master_ips: "{{ hostvars['localhost'].oo_master_ips | default(['']) }}", oo_bind_ip: "{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address | default(['']) }}" } diff --git a/playbooks/aws/openshift-minion/launch.yml b/playbooks/aws/openshift-node/launch.yml index a889b93be..a889b93be 100644 --- a/playbooks/aws/openshift-minion/launch.yml +++ b/playbooks/aws/openshift-node/launch.yml diff --git a/playbooks/aws/openshift-minion/vars.yml b/playbooks/aws/openshift-node/vars.yml index e69de29bb..e69de29bb 100644 --- a/playbooks/aws/openshift-minion/vars.yml +++ b/playbooks/aws/openshift-node/vars.yml |