summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/aws/ansible-tower/config.yml8
l---------playbooks/aws/ansible-tower/filter_plugins1
l---------playbooks/aws/ansible-tower/roles1
-rw-r--r--playbooks/aws/openshift-master/config.yml20
l---------playbooks/aws/openshift-master/filter_plugins1
l---------playbooks/aws/openshift-master/roles1
-rw-r--r--playbooks/aws/openshift-node/config.yml21
l---------playbooks/aws/openshift-node/filter_plugins1
l---------playbooks/aws/openshift-node/roles1
-rw-r--r--playbooks/aws/os2-atomic-proxy/config.yml4
l---------playbooks/aws/os2-atomic-proxy/filter_plugins1
l---------playbooks/aws/os2-atomic-proxy/roles1
-rw-r--r--playbooks/gce/openshift-master/config.yml21
l---------playbooks/gce/openshift-master/filter_plugins1
l---------playbooks/gce/openshift-master/roles1
-rw-r--r--playbooks/gce/openshift-node/config.yml28
l---------playbooks/gce/openshift-node/filter_plugins1
l---------playbooks/gce/openshift-node/roles1
18 files changed, 66 insertions, 48 deletions
diff --git a/playbooks/aws/ansible-tower/config.yml b/playbooks/aws/ansible-tower/config.yml
index 423860828..30a27d0e0 100644
--- a/playbooks/aws/ansible-tower/config.yml
+++ b/playbooks/aws/ansible-tower/config.yml
@@ -16,7 +16,7 @@
- vars.yml
- "vars.{{ oo_env }}.yml"
roles:
- - ../../../roles/base_os
- - ../../../roles/os_ipv6_disable
- - ../../../roles/ansible
- - ../../../roles/ansible_tower
+ - base_os
+ - os_ipv6_disable
+ - ansible
+ - ansible_tower
diff --git a/playbooks/aws/ansible-tower/filter_plugins b/playbooks/aws/ansible-tower/filter_plugins
new file mode 120000
index 000000000..99a95e4ca
--- /dev/null
+++ b/playbooks/aws/ansible-tower/filter_plugins
@@ -0,0 +1 @@
+../../../filter_plugins \ No newline at end of file
diff --git a/playbooks/aws/ansible-tower/roles b/playbooks/aws/ansible-tower/roles
new file mode 120000
index 000000000..20c4c58cf
--- /dev/null
+++ b/playbooks/aws/ansible-tower/roles
@@ -0,0 +1 @@
+../../../roles \ No newline at end of file
diff --git a/playbooks/aws/openshift-master/config.yml b/playbooks/aws/openshift-master/config.yml
index 8a5873189..a8f7e25a5 100644
--- a/playbooks/aws/openshift-master/config.yml
+++ b/playbooks/aws/openshift-master/config.yml
@@ -1,3 +1,4 @@
+---
- name: "populate oo_hosts_to_config host group if needed"
hosts: localhost
gather_facts: no
@@ -16,11 +17,11 @@
hosts: localhost
gather_facts: no
tasks:
- - name: Setting oo_node_ips fact on localhost
+ - name: Setting openshift_node_ips fact on localhost
set_fact:
- oo_node_ips: "{{ hostvars
+ openshift_node_ips: "{{ hostvars
| oo_select_keys(groups['tag_env-host-type_' + oo_env + '-openshift-node'])
- | oo_collect(attribute='ansible_eth0.ipv4.address') }}"
+ | oo_collect(attribute='ansible_default_ipv4.address') }}"
when: groups['tag_env-host-type_' + oo_env + '-openshift-node'] is defined
- name: "Configure instances"
@@ -30,11 +31,12 @@
vars_files:
- vars.yml
roles:
- - ../../../roles/base_os
- - ../../../roles/repos
+ - base_os
+ - repos
- {
- role: ../../../roles/openshift_master,
- oo_node_ips: "{{ hostvars['localhost'].oo_node_ips | default(['']) }}",
- oo_bind_ip: "{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address | default(['']) }}"
+ role: openshift_master,
+ openshift_node_ips: "{{ hostvars['localhost'].openshift_node_ips | default(['']) }}",
+ openshift_env: "{{ oo_env }}"
+ # TODO: openshift_public_ip: set to aws instance public ip
}
- - ../../../roles/pods
+ - pods
diff --git a/playbooks/aws/openshift-master/filter_plugins b/playbooks/aws/openshift-master/filter_plugins
new file mode 120000
index 000000000..99a95e4ca
--- /dev/null
+++ b/playbooks/aws/openshift-master/filter_plugins
@@ -0,0 +1 @@
+../../../filter_plugins \ No newline at end of file
diff --git a/playbooks/aws/openshift-master/roles b/playbooks/aws/openshift-master/roles
new file mode 120000
index 000000000..20c4c58cf
--- /dev/null
+++ b/playbooks/aws/openshift-master/roles
@@ -0,0 +1 @@
+../../../roles \ No newline at end of file
diff --git a/playbooks/aws/openshift-node/config.yml b/playbooks/aws/openshift-node/config.yml
index 2170f14a3..4e851f928 100644
--- a/playbooks/aws/openshift-node/config.yml
+++ b/playbooks/aws/openshift-node/config.yml
@@ -1,3 +1,4 @@
+---
- name: "populate oo_hosts_to_config host group if needed"
hosts: localhost
gather_facts: no
@@ -16,11 +17,11 @@
hosts: localhost
gather_facts: no
tasks:
- - name: Setting oo_master_ips fact on localhost
+ - name: Setting openshift_master_ips fact on localhost
set_fact:
- oo_master_ips: "{{ hostvars
+ openshift_master_ips: "{{ hostvars
| oo_select_keys(groups['tag_env-host-type_' + oo_env + '-openshift-master'])
- | oo_collect(attribute='ansible_eth0.ipv4.address') }}"
+ | oo_collect(attribute='ansible_default_ipv4.address') }}"
when: groups['tag_env-host-type_' + oo_env + '-openshift-master'] is defined
- name: "Configure instances"
@@ -30,11 +31,13 @@
vars_files:
- vars.yml
roles:
- - ../../../roles/base_os
- - ../../../roles/repos
- - ../../../roles/docker
+ - base_os
+ - repos
+ - docker
- {
- role: ../../../roles/openshift_node,
- oo_master_ips: "{{ hostvars['localhost'].oo_master_ips | default(['']) }}",
- oo_bind_ip: "{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address | default(['']) }}"
+ role: openshift_node,
+ openshift_master_ips: "{{ hostvars['localhost'].openshift_master_ips | default(['']) }}",
+ # TODO: add openshift_Master_public_ips
+ openshift_env: {{ "oo_env" }}
+ # TODO: openshift_public_ip: set to aws instance public ip
}
diff --git a/playbooks/aws/openshift-node/filter_plugins b/playbooks/aws/openshift-node/filter_plugins
new file mode 120000
index 000000000..99a95e4ca
--- /dev/null
+++ b/playbooks/aws/openshift-node/filter_plugins
@@ -0,0 +1 @@
+../../../filter_plugins \ No newline at end of file
diff --git a/playbooks/aws/openshift-node/roles b/playbooks/aws/openshift-node/roles
new file mode 120000
index 000000000..20c4c58cf
--- /dev/null
+++ b/playbooks/aws/openshift-node/roles
@@ -0,0 +1 @@
+../../../roles \ No newline at end of file
diff --git a/playbooks/aws/os2-atomic-proxy/config.yml b/playbooks/aws/os2-atomic-proxy/config.yml
index 0124156a9..7d384a665 100644
--- a/playbooks/aws/os2-atomic-proxy/config.yml
+++ b/playbooks/aws/os2-atomic-proxy/config.yml
@@ -16,5 +16,5 @@
- vars.yml
- "vars.{{ oo_env }}.yml"
roles:
- - ../../../roles/atomic_base
- - ../../../roles/atomic_proxy
+ - atomic_base
+ - atomic_proxy
diff --git a/playbooks/aws/os2-atomic-proxy/filter_plugins b/playbooks/aws/os2-atomic-proxy/filter_plugins
new file mode 120000
index 000000000..99a95e4ca
--- /dev/null
+++ b/playbooks/aws/os2-atomic-proxy/filter_plugins
@@ -0,0 +1 @@
+../../../filter_plugins \ No newline at end of file
diff --git a/playbooks/aws/os2-atomic-proxy/roles b/playbooks/aws/os2-atomic-proxy/roles
new file mode 120000
index 000000000..20c4c58cf
--- /dev/null
+++ b/playbooks/aws/os2-atomic-proxy/roles
@@ -0,0 +1 @@
+../../../roles \ No newline at end of file
diff --git a/playbooks/gce/openshift-master/config.yml b/playbooks/gce/openshift-master/config.yml
index cfdb5bbbe..1c7dea3ca 100644
--- a/playbooks/gce/openshift-master/config.yml
+++ b/playbooks/gce/openshift-master/config.yml
@@ -1,3 +1,4 @@
+---
- name: "populate oo_hosts_to_config host group if needed"
hosts: localhost
gather_facts: no
@@ -16,11 +17,11 @@
hosts: localhost
gather_facts: no
tasks:
- - name: Setting oo_node_ips fact on localhost
+ - name: Setting openshift_node_ips fact on localhost
set_fact:
- oo_node_ips: "{{ hostvars
+ openshift_node_ips: "{{ hostvars
| oo_select_keys(groups['tag_env-host-type-' + oo_env + '-openshift-node'])
- | oo_collect(attribute='ansible_eth0.ipv4.address') }}"
+ | oo_collect(attribute='ansible_default_ipv4.address') }}"
when: groups['tag_env-host-type-' + oo_env + '-openshift-node'] is defined
- name: "Configure instances"
@@ -30,12 +31,12 @@
vars_files:
- vars.yml
roles:
- - ../../../roles/base_os
- - ../../../roles/repos
+ - base_os
+ - repos
- {
- role: ../../../roles/openshift_master,
- 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 }}"
+ role: openshift_master,
+ openshift_node_ips: "{{ hostvars['localhost'].openshift_node_ips | default(['']) }}",
+ openshift_public_ip: "{{ gce_public_ip }}",
+ openshift_env: "{{ oo_env }}",
}
- - ../../../roles/pods
+ - pods
diff --git a/playbooks/gce/openshift-master/filter_plugins b/playbooks/gce/openshift-master/filter_plugins
new file mode 120000
index 000000000..99a95e4ca
--- /dev/null
+++ b/playbooks/gce/openshift-master/filter_plugins
@@ -0,0 +1 @@
+../../../filter_plugins \ No newline at end of file
diff --git a/playbooks/gce/openshift-master/roles b/playbooks/gce/openshift-master/roles
new file mode 120000
index 000000000..20c4c58cf
--- /dev/null
+++ b/playbooks/gce/openshift-master/roles
@@ -0,0 +1 @@
+../../../roles \ No newline at end of file
diff --git a/playbooks/gce/openshift-node/config.yml b/playbooks/gce/openshift-node/config.yml
index c9cacbc63..adfad5d7e 100644
--- a/playbooks/gce/openshift-node/config.yml
+++ b/playbooks/gce/openshift-node/config.yml
@@ -1,7 +1,7 @@
+---
- name: "populate oo_hosts_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"
@@ -17,15 +17,15 @@
hosts: localhost
gather_facts: no
tasks:
- - name: Setting oo_master_ips fact on localhost
+ - name: Setting openshift_master_ips fact on localhost
set_fact:
- oo_master_ips: "{{ hostvars
+ openshift_master_ips: "{{ hostvars
| oo_select_keys(groups['tag_env-host-type-' + oo_env + '-openshift-master'])
- | oo_collect(attribute='ansible_eth0.ipv4.address') }}"
+ | oo_collect(attribute='ansible_default_ipv4.address') }}"
when: groups['tag_env-host-type-' + oo_env + '-openshift-master'] is defined
- - name: Setting oo_master_public_ips fact on localhost
+ - name: Setting openshift_master_public_ips fact on localhost
set_fact:
- oo_master_public_ips: "{{ hostvars
+ openshift_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
@@ -37,13 +37,13 @@
vars_files:
- vars.yml
roles:
- - ../../../roles/base_os
- - ../../../roles/repos
- - ../../../roles/docker
+ - base_os
+ - repos
+ - docker
- {
- role: ../../../roles/openshift_node,
- oo_master_ips: "{{ hostvars['localhost'].oo_master_ips | 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 }}"
+ role: openshift_node,
+ openshift_master_ips: "{{ hostvars['localhost'].openshift_master_ips | default(['']) }}",
+ openshift_master_public_ips: "{{ hostvars['localhost'].openshift_master_public_ips | default(['']) }}",
+ openshift_public_ip: "{{ gce_public_ip }}",
+ openshift_env: "{{ oo_env }}",
}
diff --git a/playbooks/gce/openshift-node/filter_plugins b/playbooks/gce/openshift-node/filter_plugins
new file mode 120000
index 000000000..99a95e4ca
--- /dev/null
+++ b/playbooks/gce/openshift-node/filter_plugins
@@ -0,0 +1 @@
+../../../filter_plugins \ No newline at end of file
diff --git a/playbooks/gce/openshift-node/roles b/playbooks/gce/openshift-node/roles
new file mode 120000
index 000000000..20c4c58cf
--- /dev/null
+++ b/playbooks/gce/openshift-node/roles
@@ -0,0 +1 @@
+../../../roles \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-07 16:58:48 +0000