summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/aws/openshift-master/config.yml14
-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
-rw-r--r--playbooks/gce/openshift-master/config.yml17
-rw-r--r--playbooks/gce/openshift-node/config.yml (renamed from playbooks/gce/openshift-minion/config.yml)19
-rw-r--r--playbooks/gce/openshift-node/launch.yml (renamed from playbooks/gce/openshift-minion/launch.yml)0
-rw-r--r--playbooks/gce/openshift-node/terminate.yml (renamed from playbooks/gce/openshift-minion/terminate.yml)2
-rw-r--r--playbooks/gce/openshift-node/vars.yml (renamed from playbooks/gce/openshift-minion/vars.yml)0
9 files changed, 35 insertions, 19 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
diff --git a/playbooks/gce/openshift-master/config.yml b/playbooks/gce/openshift-master/config.yml
index f705bb305..cfdb5bbbe 100644
--- a/playbooks/gce/openshift-master/config.yml
+++ b/playbooks/gce/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,8 @@
- ../../../roles/repos
- {
role: ../../../roles/openshift_master,
- oo_minion_ips: "{{ hostvars['localhost'].oo_minion_ips | default(['']) }}",
- oo_bind_ip: "{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address | default(['']) }}"
+ oo_node_ips: "{{ hostvars['localhost'].oo_node_ips | default(['']) }}",
+ oo_bind_ip: "{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address | default(['']) }}",
+ oo_public_ip: "{{ gce_public_ip }}"
}
- ../../../roles/pods
diff --git a/playbooks/gce/openshift-minion/config.yml b/playbooks/gce/openshift-node/config.yml
index 0f78d4c76..1f201902f 100644
--- a/playbooks/gce/openshift-minion/config.yml
+++ b/playbooks/gce/openshift-node/config.yml
@@ -22,6 +22,19 @@
| oo_select_keys(groups['tag_env-host-type-' + oo_env + '-openshift-master'])
| oo_collect(attribute='ansible_eth0.ipv4.address') }}"
when: groups['tag_env-host-type-' + oo_env + '-openshift-master'] is defined
+ - name: Setting oo_master_public_ips fact on localhost
+ set_fact:
+ oo_master_public_ips: "{{ hostvars
+ | oo_select_keys(groups['tag_env-host-type-' + oo_env + '-openshift-master'])
+ | oo_collect(attribute='gce_public_ip') }}"
+ when: groups['tag_env-host-type-' + oo_env + '-openshift-master'] is defined
+
+- name: "Debug hostvars"
+ hosts: oo_hosts_to_config
+ connection: ssh
+ user: root
+ tasks:
+ - debug: var=hostvars
- name: "Configure instances"
hosts: oo_hosts_to_config
@@ -34,7 +47,9 @@
- ../../../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(['']) }}"
+ oo_master_public_ips: "{{ hostvars['localhost'].oo_master_public_ips | default(['']) }}",
+ oo_bind_ip: "{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address | default(['']) }}",
+ oo_public_ip: "{{ hostvars[inventory_hostname].ansible_ssh_host }}"
}
diff --git a/playbooks/gce/openshift-minion/launch.yml b/playbooks/gce/openshift-node/launch.yml
index f2800b061..f2800b061 100644
--- a/playbooks/gce/openshift-minion/launch.yml
+++ b/playbooks/gce/openshift-node/launch.yml
diff --git a/playbooks/gce/openshift-minion/terminate.yml b/playbooks/gce/openshift-node/terminate.yml
index 97b31eca0..8d60f27b3 100644
--- a/playbooks/gce/openshift-minion/terminate.yml
+++ b/playbooks/gce/openshift-node/terminate.yml
@@ -16,7 +16,7 @@
hosts: localhost
connection: local
tasks:
- - name: Terminate minion instances
+ - name: Terminate node instances
gce:
service_account_email: "{{ gce_service_account_email }}"
pem_file: "{{ gce_pem_file }}"
diff --git a/playbooks/gce/openshift-minion/vars.yml b/playbooks/gce/openshift-node/vars.yml
index e69de29bb..e69de29bb 100644
--- a/playbooks/gce/openshift-minion/vars.yml
+++ b/playbooks/gce/openshift-node/vars.yml