diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2015-03-18 13:25:18 -0400 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2015-03-24 11:23:25 -0700 |
| commit | 9575258e5a1b8f9ee8ec7ffc7ad74fa5dfeabc00 (patch) | |
| tree | 91452465b425fb09ececa4ea22d08d13dd7261aa /playbooks/aws | |
| parent | 13dc8505feb93adc311a4a2d8e714c7d1e61cf1f (diff) | |
| download | openshift-9575258e5a1b8f9ee8ec7ffc7ad74fa5dfeabc00.tar.gz openshift-9575258e5a1b8f9ee8ec7ffc7ad74fa5dfeabc00.tar.bz2 openshift-9575258e5a1b8f9ee8ec7ffc7ad74fa5dfeabc00.tar.xz openshift-9575258e5a1b8f9ee8ec7ffc7ad74fa5dfeabc00.zip | |
replace oo_hosts_to_config with oo_nodes_to_config and oo_masters_to_config
Diffstat (limited to 'playbooks/aws')
| -rw-r--r-- | playbooks/aws/openshift-master/config.yml | 6 | ||||
| -rw-r--r-- | playbooks/aws/openshift-master/launch.yml | 4 | ||||
| -rw-r--r-- | playbooks/aws/openshift-node/config.yml | 6 | ||||
| -rw-r--r-- | playbooks/aws/openshift-node/launch.yml | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/playbooks/aws/openshift-master/config.yml b/playbooks/aws/openshift-master/config.yml index b3227afa9..bbf1f654a 100644 --- a/playbooks/aws/openshift-master/config.yml +++ b/playbooks/aws/openshift-master/config.yml @@ -1,10 +1,10 @@ --- -- name: "populate oo_hosts_to_config host group if needed" +- name: "populate oo_masters_to_config host group if needed" hosts: localhost gather_facts: no tasks: - name: "Evaluate oo_host_group_exp if it's set" - add_host: "name={{ item }} groups=oo_hosts_to_config" + add_host: "name={{ item }} groups=oo_masters_to_config" with_items: "{{ oo_host_group_exp | default('') }}" when: oo_host_group_exp is defined @@ -25,7 +25,7 @@ when: groups['tag_env-host-type_' + oo_env + '-openshift-node'] is defined - name: "Configure instances" - hosts: oo_hosts_to_config + hosts: oo_masters_to_config connection: ssh user: root vars_files: diff --git a/playbooks/aws/openshift-master/launch.yml b/playbooks/aws/openshift-master/launch.yml index a889b93be..3d5a7f579 100644 --- a/playbooks/aws/openshift-master/launch.yml +++ b/playbooks/aws/openshift-master/launch.yml @@ -45,8 +45,8 @@ args: tags: "{{ oo_new_inst_tags }}" - - name: Add new instances public IPs to oo_hosts_to_config - add_host: "hostname={{ item.0 }} ansible_ssh_host={{ item.1.dns_name }} groupname=oo_hosts_to_config" + - name: Add new instances public IPs to oo_masters_to_config + add_host: "hostname={{ item.0 }} ansible_ssh_host={{ item.1.dns_name }} groupname=oo_masters_to_config" with_together: - oo_new_inst_names - ec2.instances diff --git a/playbooks/aws/openshift-node/config.yml b/playbooks/aws/openshift-node/config.yml index 21807b1cf..822b66464 100644 --- a/playbooks/aws/openshift-node/config.yml +++ b/playbooks/aws/openshift-node/config.yml @@ -1,10 +1,10 @@ --- -- name: "populate oo_hosts_to_config host group if needed" +- name: "populate oo_nodes_to_config host group if needed" hosts: localhost gather_facts: no tasks: - name: Evaluate oo_host_group_exp - add_host: "name={{ item }} groups=oo_hosts_to_config" + add_host: "name={{ item }} groups=oo_nodes_to_config" with_items: "{{ oo_host_group_exp | default('') }}" when: oo_host_group_exp is defined @@ -31,7 +31,7 @@ when: groups['tag_env-host-type-' + oo_env + '-openshift-master'] is defined - name: "Configure instances" - hosts: oo_hosts_to_config + hosts: oo_nodes_to_config connection: ssh user: root vars_files: diff --git a/playbooks/aws/openshift-node/launch.yml b/playbooks/aws/openshift-node/launch.yml index a889b93be..4745fc658 100644 --- a/playbooks/aws/openshift-node/launch.yml +++ b/playbooks/aws/openshift-node/launch.yml @@ -45,8 +45,8 @@ args: tags: "{{ oo_new_inst_tags }}" - - name: Add new instances public IPs to oo_hosts_to_config - add_host: "hostname={{ item.0 }} ansible_ssh_host={{ item.1.dns_name }} groupname=oo_hosts_to_config" + - name: Add new instances public IPs to oo_nodes_to_config + add_host: "hostname={{ item.0 }} ansible_ssh_host={{ item.1.dns_name }} groupname=oo_nodes_to_config" with_together: - oo_new_inst_names - ec2.instances |