diff options
| author | Tobias Florek <tob@butter.sh> | 2015-09-23 13:51:41 +0200 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2015-12-15 15:43:27 -0500 |
| commit | a0b6fc7db1be2cf6190d982f90e96f4c39a4c699 (patch) | |
| tree | abab0b910d891a8b419b2231b3a52075ea1f0e49 /roles/openshift_master_ca | |
| parent | e26eab4bdc817ef02a16e8b5c6c49e311a721e7b (diff) | |
| download | openshift-a0b6fc7db1be2cf6190d982f90e96f4c39a4c699.tar.gz openshift-a0b6fc7db1be2cf6190d982f90e96f4c39a4c699.tar.bz2 openshift-a0b6fc7db1be2cf6190d982f90e96f4c39a4c699.tar.xz openshift-a0b6fc7db1be2cf6190d982f90e96f4c39a4c699.zip | |
Initial containerization work from @ibotty
copied from https://github.com/eparis/kubernetes-ansible/blob/17f98edd7ff53e649b43e26822b8fbc0be42b233/roles/common/tasks/main.yml
Diffstat (limited to 'roles/openshift_master_ca')
| -rw-r--r-- | roles/openshift_master_ca/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_master_ca/vars/main.yml | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/roles/openshift_master_ca/tasks/main.yml b/roles/openshift_master_ca/tasks/main.yml index 0db95a4eb..c179ceb61 100644 --- a/roles/openshift_master_ca/tasks/main.yml +++ b/roles/openshift_master_ca/tasks/main.yml @@ -1,9 +1,11 @@ --- - name: Install the base package for admin tooling action: "{{ ansible_pkg_mgr }} name={{ openshift.common.service_type }}{{ openshift_version }} state=present" + when: not is_atomic - name: Reload generated facts openshift_facts: + when: install_result | changed - name: Create openshift_master_config_dir if it doesn't exist file: diff --git a/roles/openshift_master_ca/vars/main.yml b/roles/openshift_master_ca/vars/main.yml index b35339b18..0f1f32a34 100644 --- a/roles/openshift_master_ca/vars/main.yml +++ b/roles/openshift_master_ca/vars/main.yml @@ -4,3 +4,6 @@ openshift_master_ca_cert: "{{ openshift_master_config_dir }}/ca.crt" openshift_master_ca_key: "{{ openshift_master_config_dir }}/ca.key" openshift_master_ca_serial: "{{ openshift_master_config_dir }}/ca.serial.txt" openshift_version: "{{ openshift_pkg_version | default('') }}" + +openshift_docker_image_name: openshift/origin +openshift_docker_image: "{{ openshift_docker_image_name }}:{{ openshift_pkg_version | default('latest') }}" |