summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/aws/ansible-tower/launch.yml2
-rw-r--r--playbooks/aws/openshift-cluster/vars.online.int.yml2
-rw-r--r--playbooks/aws/openshift-cluster/vars.online.prod.yml2
-rw-r--r--playbooks/aws/openshift-cluster/vars.online.stage.yml2
-rw-r--r--playbooks/byo/config.yml2
-rw-r--r--playbooks/common/openshift-node/config.yml5
6 files changed, 8 insertions, 7 deletions
diff --git a/playbooks/aws/ansible-tower/launch.yml b/playbooks/aws/ansible-tower/launch.yml
index 56235bc8a..c23bda3a0 100644
--- a/playbooks/aws/ansible-tower/launch.yml
+++ b/playbooks/aws/ansible-tower/launch.yml
@@ -6,7 +6,7 @@
vars:
inst_region: us-east-1
- rhel7_ami: ami-906240f8
+ rhel7_ami: ami-78756d10
user_data_file: user_data.txt
vars_files:
diff --git a/playbooks/aws/openshift-cluster/vars.online.int.yml b/playbooks/aws/openshift-cluster/vars.online.int.yml
index 12f79a9c1..e115615d5 100644
--- a/playbooks/aws/openshift-cluster/vars.online.int.yml
+++ b/playbooks/aws/openshift-cluster/vars.online.int.yml
@@ -1,5 +1,5 @@
---
-ec2_image: ami-906240f8
+ec2_image: ami-78756d10
ec2_image_name: libra-ops-rhel7*
ec2_region: us-east-1
ec2_keypair: mmcgrath_libra
diff --git a/playbooks/aws/openshift-cluster/vars.online.prod.yml b/playbooks/aws/openshift-cluster/vars.online.prod.yml
index 12f79a9c1..e115615d5 100644
--- a/playbooks/aws/openshift-cluster/vars.online.prod.yml
+++ b/playbooks/aws/openshift-cluster/vars.online.prod.yml
@@ -1,5 +1,5 @@
---
-ec2_image: ami-906240f8
+ec2_image: ami-78756d10
ec2_image_name: libra-ops-rhel7*
ec2_region: us-east-1
ec2_keypair: mmcgrath_libra
diff --git a/playbooks/aws/openshift-cluster/vars.online.stage.yml b/playbooks/aws/openshift-cluster/vars.online.stage.yml
index 12f79a9c1..e115615d5 100644
--- a/playbooks/aws/openshift-cluster/vars.online.stage.yml
+++ b/playbooks/aws/openshift-cluster/vars.online.stage.yml
@@ -1,5 +1,5 @@
---
-ec2_image: ami-906240f8
+ec2_image: ami-78756d10
ec2_image_name: libra-ops-rhel7*
ec2_region: us-east-1
ec2_keypair: mmcgrath_libra
diff --git a/playbooks/byo/config.yml b/playbooks/byo/config.yml
index dce49d32f..e059514db 100644
--- a/playbooks/byo/config.yml
+++ b/playbooks/byo/config.yml
@@ -1,6 +1,8 @@
---
- name: Run the openshift-master config playbook
include: openshift-master/config.yml
+ when: groups.masters is defined and groups.masters
- name: Run the openshift-node config playbook
include: openshift-node/config.yml
+ when: groups.nodes is defined and groups.nodes and groups.masters is defined and groups.masters
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml
index 433cfeb87..96641a274 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -15,6 +15,7 @@
local_facts:
hostname: "{{ openshift_hostname | default(None) }}"
public_hostname: "{{ openshift_public_hostname | default(None) }}"
+ deployment_type: "{{ openshift_deployment_type }}"
- role: node
local_facts:
external_id: "{{ openshift_node_external_id | default(None) }}"
@@ -23,7 +24,6 @@
pod_cidr: "{{ openshift_node_pod_cidr | default(None) }}"
labels: "{{ openshift_node_labels | default(None) }}"
annotations: "{{ openshift_node_annotations | default(None) }}"
- deployment_type: "{{ openshift_deployment_type }}"
- name: Create temp directory for syncing certs
@@ -68,7 +68,6 @@
fetch:
src: "{{ sync_tmpdir }}/{{ item.openshift.common.hostname }}.tgz"
dest: "{{ sync_tmpdir }}/"
- flat: yes
fail_on_missing: yes
validate_checksum: yes
with_items: openshift_nodes
@@ -79,7 +78,7 @@
hosts: oo_nodes_to_config
gather_facts: no
vars:
- sync_tmpdir: "{{ hostvars.localhost.mktemp.stdout }}"
+ sync_tmpdir: "{{ hostvars.localhost.mktemp.stdout }}/{{ groups['oo_first_master'][0] }}/{{ hostvars.localhost.mktemp.stdout }}"
openshift_sdn_master_url: "https://{{ hostvars[groups['oo_first_master'][0]].openshift.common.hostname }}:4001"
pre_tasks:
- name: Ensure certificate directory exists