diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-01 11:40:46 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-01 14:20:24 -0400 |
| commit | 590e5582ed22a491ed2a4701492083fa6521f047 (patch) | |
| tree | 7c26314ccafcf276e47e506153932cea236022a8 /roles | |
| parent | cca99e30e92168b379a435ff70b66cdd768d8a83 (diff) | |
| download | openshift-590e5582ed22a491ed2a4701492083fa6521f047.tar.gz openshift-590e5582ed22a491ed2a4701492083fa6521f047.tar.bz2 openshift-590e5582ed22a491ed2a4701492083fa6521f047.tar.xz openshift-590e5582ed22a491ed2a4701492083fa6521f047.zip | |
Bug 1322788 - The IMAGE_VERSION wasn't added to atomic-openshift-master-api and atomic-openshift-master-controllers
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_cli/defaults/main.yml (renamed from roles/openshift_cli/vars/main.yml) | 0 | ||||
| -rw-r--r-- | roles/openshift_common/defaults/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_common/vars/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_master/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_master/vars/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_node/defaults/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_node/vars/main.yml | 1 |
7 files changed, 4 insertions, 3 deletions
diff --git a/roles/openshift_cli/vars/main.yml b/roles/openshift_cli/defaults/main.yml index 4d0c87497..4d0c87497 100644 --- a/roles/openshift_cli/vars/main.yml +++ b/roles/openshift_cli/defaults/main.yml diff --git a/roles/openshift_common/defaults/main.yml b/roles/openshift_common/defaults/main.yml index 267c03605..e46af70c7 100644 --- a/roles/openshift_common/defaults/main.yml +++ b/roles/openshift_common/defaults/main.yml @@ -1,3 +1,4 @@ --- openshift_cluster_id: 'default' openshift_debug_level: 2 +openshift_version: "{{ openshift_pkg_version | default('') }}" diff --git a/roles/openshift_common/vars/main.yml b/roles/openshift_common/vars/main.yml index b163f8aae..50816d319 100644 --- a/roles/openshift_common/vars/main.yml +++ b/roles/openshift_common/vars/main.yml @@ -5,4 +5,3 @@ # chains with the public zone (or the zone associated with the correct # interfaces) os_firewall_use_firewalld: False -openshift_version: "{{ openshift_pkg_version | default('') }}" diff --git a/roles/openshift_master/defaults/main.yml b/roles/openshift_master/defaults/main.yml index 1f74d851a..afc81a414 100644 --- a/roles/openshift_master/defaults/main.yml +++ b/roles/openshift_master/defaults/main.yml @@ -28,3 +28,5 @@ os_firewall_deny: port: 8080/tcp - service: former etcd peer port port: 7001/tcp + +openshift_version: "{{ openshift_pkg_version | default(openshift_image_tag) | default(openshift.common.image_tag) | default('') }}" diff --git a/roles/openshift_master/vars/main.yml b/roles/openshift_master/vars/main.yml index 198f9235d..7c1d5a212 100644 --- a/roles/openshift_master/vars/main.yml +++ b/roles/openshift_master/vars/main.yml @@ -6,7 +6,6 @@ loopback_context_string: "current-context: {{ openshift.master.loopback_context_ openshift_master_scheduler_conf: "{{ openshift_master_config_dir }}/scheduler.json" openshift_master_session_secrets_file: "{{ openshift_master_config_dir }}/session-secrets.yaml" openshift_master_policy: "{{ openshift_master_config_dir }}/policy.json" -openshift_version: "{{ openshift_pkg_version | default(openshift_image_tag) | default(openshift.common.image_tag) | default('') }}" scheduler_config: kind: Policy diff --git a/roles/openshift_node/defaults/main.yml b/roles/openshift_node/defaults/main.yml index fffbf2994..c4f718bfb 100644 --- a/roles/openshift_node/defaults/main.yml +++ b/roles/openshift_node/defaults/main.yml @@ -13,3 +13,4 @@ os_firewall_allow: - service: OpenShift OVS sdn port: 4789/udp when: openshift.node.use_openshift_sdn | bool +openshift_version: "{{ openshift_pkg_version | default(openshift_image_tag) | default(openshift.common.image_tag) | default('') }}" diff --git a/roles/openshift_node/vars/main.yml b/roles/openshift_node/vars/main.yml index 28582baf1..77a9694de 100644 --- a/roles/openshift_node/vars/main.yml +++ b/roles/openshift_node/vars/main.yml @@ -1,4 +1,3 @@ --- openshift_node_config_dir: "{{ openshift.common.config_base }}/node" openshift_node_config_file: "{{ openshift_node_config_dir }}/node-config.yaml" -openshift_version: "{{ openshift_pkg_version | default(openshift_image_tag) | default(openshift.common.image_tag) | default('') }}" |