summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2015-12-07 10:24:20 -0500
committerScott Dodson <sdodson@redhat.com>2015-12-15 17:07:17 -0500
commitafe0064e01d3f6f33f323ffea7aae0eaf00b9ac2 (patch)
tree1ab5236c3948197cb8976cac91305937f45bb727 /playbooks/common
parent3f2be7d987ccef8c4e157163dd9394ba6492a88c (diff)
downloadopenshift-afe0064e01d3f6f33f323ffea7aae0eaf00b9ac2.tar.gz
openshift-afe0064e01d3f6f33f323ffea7aae0eaf00b9ac2.tar.bz2
openshift-afe0064e01d3f6f33f323ffea7aae0eaf00b9ac2.tar.xz
openshift-afe0064e01d3f6f33f323ffea7aae0eaf00b9ac2.zip
Skip yum/dnf ops when is_containerized
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml1
-rw-r--r--playbooks/common/openshift-master/config.yml1
2 files changed, 2 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml
index fc098b4ed..1f9c6afd3 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml
@@ -235,6 +235,7 @@
- name: Ensure python-yaml present for config upgrade
action: "{{ ansible_pkg_mgr }} name=PyYAML state=present"
+ when: not openshift.common.is_atomic | bool
- name: Upgrade master configuration
openshift_upgrade_config:
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index 9c800af39..3598bdad7 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -246,6 +246,7 @@
when: (openshift_master_session_auth_secrets is defined and openshift_master_session_encryption_secrets is defined) and (openshift_master_session_auth_secrets | length != openshift_master_session_encryption_secrets | length)
- name: Install OpenSSL package
action: "{{ ansible_pkg_mgr }} name=openssl state=present"
+ when: not openshift.common.is_atomic | bool
- name: Generate session authentication key
command: /usr/bin/openssl rand -base64 24
register: session_auth_output