From eb6b20fc9183cc2aae424c72efd1191b99110a93 Mon Sep 17 00:00:00 2001
From: Michael Gugino <mgugino@redhat.com>
Date: Mon, 27 Nov 2017 15:39:46 -0500
Subject: Remove openshift.common.service_type

This commit removes openshift.common.service_type
in favor of openshift_service_type.

This commit also removes r_openshift_excluder_service_type
from plays in favor of using the role's defaults.
---
 roles/openshift_node/tasks/aws.yml                         |  2 +-
 roles/openshift_node/tasks/config.yml                      |  8 ++++----
 .../tasks/config/configure-node-settings.yml               |  2 +-
 .../tasks/config/configure-proxy-settings.yml              |  2 +-
 .../tasks/config/install-node-deps-docker-service-file.yml |  2 +-
 .../tasks/config/install-node-docker-service-file.yml      |  2 +-
 roles/openshift_node/tasks/docker/upgrade.yml              |  2 +-
 roles/openshift_node/tasks/install.yml                     |  4 ++--
 roles/openshift_node/tasks/node_system_container.yml       |  4 ++--
 roles/openshift_node/tasks/systemd_units.yml               |  2 +-
 roles/openshift_node/tasks/upgrade.yml                     | 14 +++++++-------
 roles/openshift_node/tasks/upgrade/restart.yml             |  8 ++++----
 roles/openshift_node/tasks/upgrade/rpm_upgrade.yml         |  6 +++---
 13 files changed, 29 insertions(+), 29 deletions(-)

(limited to 'roles/openshift_node/tasks')

diff --git a/roles/openshift_node/tasks/aws.yml b/roles/openshift_node/tasks/aws.yml
index 38c2b794d..a7f1fc116 100644
--- a/roles/openshift_node/tasks/aws.yml
+++ b/roles/openshift_node/tasks/aws.yml
@@ -1,7 +1,7 @@
 ---
 - name: Configure AWS Cloud Provider Settings
   lineinfile:
-    dest: /etc/sysconfig/{{ openshift.common.service_type }}-node
+    dest: /etc/sysconfig/{{ openshift_service_type }}-node
     regexp: "{{ item.regex }}"
     line: "{{ item.line }}"
     create: true
diff --git a/roles/openshift_node/tasks/config.yml b/roles/openshift_node/tasks/config.yml
index 741a2234f..e5c80bd09 100644
--- a/roles/openshift_node/tasks/config.yml
+++ b/roles/openshift_node/tasks/config.yml
@@ -38,7 +38,7 @@
 
 - name: Configure Node Environment Variables
   lineinfile:
-    dest: /etc/sysconfig/{{ openshift.common.service_type }}-node
+    dest: /etc/sysconfig/{{ openshift_service_type }}-node
     regexp: "^{{ item.key }}="
     line: "{{ item.key }}={{ item.value }}"
     create: true
@@ -76,7 +76,7 @@
     - name: Start and enable node dep
       systemd:
         daemon_reload: yes
-        name: "{{ openshift.common.service_type }}-node-dep"
+        name: "{{ openshift_service_type }}-node-dep"
         enabled: yes
         state: started
 
@@ -84,7 +84,7 @@
   block:
     - name: Start and enable node
       systemd:
-        name: "{{ openshift.common.service_type }}-node"
+        name: "{{ openshift_service_type }}-node"
         enabled: yes
         state: started
         daemon_reload: yes
@@ -95,7 +95,7 @@
       ignore_errors: true
 
     - name: Dump logs from node service if it failed
-      command: journalctl --no-pager -n 100 -u {{ openshift.common.service_type }}-node
+      command: journalctl --no-pager -n 100 -u {{ openshift_service_type }}-node
       when: node_start_result | failed
 
     - name: Abort if node failed to start
diff --git a/roles/openshift_node/tasks/config/configure-node-settings.yml b/roles/openshift_node/tasks/config/configure-node-settings.yml
index 527580481..ebc1426d3 100644
--- a/roles/openshift_node/tasks/config/configure-node-settings.yml
+++ b/roles/openshift_node/tasks/config/configure-node-settings.yml
@@ -1,7 +1,7 @@
 ---
 - name: Configure Node settings
   lineinfile:
-    dest: /etc/sysconfig/{{ openshift.common.service_type }}-node
+    dest: /etc/sysconfig/{{ openshift_service_type }}-node
     regexp: "{{ item.regex }}"
     line: "{{ item.line }}"
     create: true
diff --git a/roles/openshift_node/tasks/config/configure-proxy-settings.yml b/roles/openshift_node/tasks/config/configure-proxy-settings.yml
index d60794305..7ddd319d2 100644
--- a/roles/openshift_node/tasks/config/configure-proxy-settings.yml
+++ b/roles/openshift_node/tasks/config/configure-proxy-settings.yml
@@ -1,7 +1,7 @@
 ---
 - name: Configure Proxy Settings
   lineinfile:
-    dest: /etc/sysconfig/{{ openshift.common.service_type }}-node
+    dest: /etc/sysconfig/{{ openshift_service_type }}-node
     regexp: "{{ item.regex }}"
     line: "{{ item.line }}"
     create: true
diff --git a/roles/openshift_node/tasks/config/install-node-deps-docker-service-file.yml b/roles/openshift_node/tasks/config/install-node-deps-docker-service-file.yml
index ee91a88ab..9f1145d12 100644
--- a/roles/openshift_node/tasks/config/install-node-deps-docker-service-file.yml
+++ b/roles/openshift_node/tasks/config/install-node-deps-docker-service-file.yml
@@ -1,7 +1,7 @@
 ---
 - name: Install Node dependencies docker service file
   template:
-    dest: "/etc/systemd/system/{{ openshift.common.service_type }}-node-dep.service"
+    dest: "/etc/systemd/system/{{ openshift_service_type }}-node-dep.service"
     src: openshift.docker.node.dep.service
   notify:
   - reload systemd units
diff --git a/roles/openshift_node/tasks/config/install-node-docker-service-file.yml b/roles/openshift_node/tasks/config/install-node-docker-service-file.yml
index f92ff79b5..649fc5f6b 100644
--- a/roles/openshift_node/tasks/config/install-node-docker-service-file.yml
+++ b/roles/openshift_node/tasks/config/install-node-docker-service-file.yml
@@ -1,7 +1,7 @@
 ---
 - name: Install Node docker service file
   template:
-    dest: "/etc/systemd/system/{{ openshift.common.service_type }}-node.service"
+    dest: "/etc/systemd/system/{{ openshift_service_type }}-node.service"
     src: openshift.docker.node.service
   notify:
   - reload systemd units
diff --git a/roles/openshift_node/tasks/docker/upgrade.yml b/roles/openshift_node/tasks/docker/upgrade.yml
index d743d2188..c13a6cf6c 100644
--- a/roles/openshift_node/tasks/docker/upgrade.yml
+++ b/roles/openshift_node/tasks/docker/upgrade.yml
@@ -1,6 +1,6 @@
 ---
 # input variables:
-# - openshift.common.service_type
+# - openshift_service_type
 # - openshift.common.is_containerized
 # - docker_upgrade_nuke_images
 # - docker_version
diff --git a/roles/openshift_node/tasks/install.yml b/roles/openshift_node/tasks/install.yml
index 1ed4a05c1..f93aed246 100644
--- a/roles/openshift_node/tasks/install.yml
+++ b/roles/openshift_node/tasks/install.yml
@@ -3,14 +3,14 @@
   block:
   - name: Install Node package
     package:
-      name: "{{ openshift.common.service_type }}-node{{ (openshift_pkg_version | default('')) | oo_image_tag_to_rpm_version(include_dash=True) }}"
+      name: "{{ openshift_service_type }}-node{{ (openshift_pkg_version | default('')) | oo_image_tag_to_rpm_version(include_dash=True) }}"
       state: present
     register: result
     until: result | success
 
   - name: Install sdn-ovs package
     package:
-      name: "{{ openshift.common.service_type }}-sdn-ovs{{ (openshift_pkg_version | default('')) | oo_image_tag_to_rpm_version(include_dash=True) }}"
+      name: "{{ openshift_service_type }}-sdn-ovs{{ (openshift_pkg_version | default('')) | oo_image_tag_to_rpm_version(include_dash=True) }}"
       state: present
     when:
     - openshift_node_use_openshift_sdn | bool
diff --git a/roles/openshift_node/tasks/node_system_container.yml b/roles/openshift_node/tasks/node_system_container.yml
index 98a391890..98978ec6f 100644
--- a/roles/openshift_node/tasks/node_system_container.yml
+++ b/roles/openshift_node/tasks/node_system_container.yml
@@ -8,10 +8,10 @@
 
 - name: Install or Update node system container
   oc_atomic_container:
-    name: "{{ openshift.common.service_type }}-node"
+    name: "{{ openshift_service_type }}-node"
     image: "{{ 'docker:' if system_images_registry == 'docker' else system_images_registry + '/' }}{{ openshift.node.node_system_image }}:{{ openshift_image_tag }}"
     values:
     - "DNS_DOMAIN={{ openshift.common.dns_domain }}"
     - "DOCKER_SERVICE={{ openshift_docker_service_name }}.service"
-    - "MASTER_SERVICE={{ openshift.common.service_type }}.service"
+    - "MASTER_SERVICE={{ openshift_service_type }}.service"
     state: latest
diff --git a/roles/openshift_node/tasks/systemd_units.yml b/roles/openshift_node/tasks/systemd_units.yml
index 397e1ba18..c532147b1 100644
--- a/roles/openshift_node/tasks/systemd_units.yml
+++ b/roles/openshift_node/tasks/systemd_units.yml
@@ -1,7 +1,7 @@
 ---
 - name: Install Node service file
   template:
-    dest: "/etc/systemd/system/{{ openshift.common.service_type }}-node.service"
+    dest: "/etc/systemd/system/{{ openshift_service_type }}-node.service"
     src: "{{ openshift.common.is_containerized | bool | ternary('openshift.docker.node.service', 'node.service.j2') }}"
   when: not l_is_node_system_container | bool
   notify:
diff --git a/roles/openshift_node/tasks/upgrade.yml b/roles/openshift_node/tasks/upgrade.yml
index 561b56918..9f333645a 100644
--- a/roles/openshift_node/tasks/upgrade.yml
+++ b/roles/openshift_node/tasks/upgrade.yml
@@ -17,7 +17,7 @@
     name: "{{ item }}"
     state: stopped
   with_items:
-  - "{{ openshift.common.service_type }}-node"
+  - "{{ openshift_service_type }}-node"
   - openvswitch
   failed_when: false
 
@@ -26,8 +26,8 @@
     name: "{{ item }}"
     state: stopped
   with_items:
-  - "{{ openshift.common.service_type }}-master-controllers"
-  - "{{ openshift.common.service_type }}-master-api"
+  - "{{ openshift_service_type }}-master-controllers"
+  - "{{ openshift_service_type }}-master-api"
   - etcd_container
   failed_when: false
   when: openshift.common.is_containerized | bool
@@ -80,9 +80,9 @@
   with_items:
   - etcd_container
   - openvswitch
-  - "{{ openshift.common.service_type }}-master-api"
-  - "{{ openshift.common.service_type }}-master-controllers"
-  - "{{ openshift.common.service_type }}-node"
+  - "{{ openshift_service_type }}-master-api"
+  - "{{ openshift_service_type }}-master-controllers"
+  - "{{ openshift_service_type }}-node"
   failed_when: false
   when: openshift.common.is_containerized | bool
 
@@ -91,7 +91,7 @@
     name: "{{ item }}"
     state: stopped
   with_items:
-  - "{{ openshift.common.service_type }}-node"
+  - "{{ openshift_service_type }}-node"
   - openvswitch
   failed_when: false
   when: not openshift.common.is_containerized | bool
diff --git a/roles/openshift_node/tasks/upgrade/restart.yml b/roles/openshift_node/tasks/upgrade/restart.yml
index 3f1abceab..65c301783 100644
--- a/roles/openshift_node/tasks/upgrade/restart.yml
+++ b/roles/openshift_node/tasks/upgrade/restart.yml
@@ -1,6 +1,6 @@
 ---
 # input variables:
-# - openshift.common.service_type
+# - openshift_service_type
 # - openshift.common.is_containerized
 # - openshift.common.hostname
 # - openshift.master.api_port
@@ -27,9 +27,9 @@
   with_items:
     - etcd_container
     - openvswitch
-    - "{{ openshift.common.service_type }}-master-api"
-    - "{{ openshift.common.service_type }}-master-controllers"
-    - "{{ openshift.common.service_type }}-node"
+    - "{{ openshift_service_type }}-master-api"
+    - "{{ openshift_service_type }}-master-controllers"
+    - "{{ openshift_service_type }}-node"
   failed_when: false
 
 - name: Wait for master API to come back online
diff --git a/roles/openshift_node/tasks/upgrade/rpm_upgrade.yml b/roles/openshift_node/tasks/upgrade/rpm_upgrade.yml
index fcbe1a598..120b93bc3 100644
--- a/roles/openshift_node/tasks/upgrade/rpm_upgrade.yml
+++ b/roles/openshift_node/tasks/upgrade/rpm_upgrade.yml
@@ -1,13 +1,13 @@
 ---
 # input variables:
-# - openshift.common.service_type
+# - openshift_service_type
 # - component
 # - openshift_pkg_version
 # - openshift.common.is_atomic
 
 # We verified latest rpm available is suitable, so just yum update.
 - name: Upgrade packages
-  package: "name={{ openshift.common.service_type }}-{{ component }}{{ openshift_pkg_version }} state=present"
+  package: "name={{ openshift_service_type }}-{{ component }}{{ openshift_pkg_version }} state=present"
   register: result
   until: result | success
 
@@ -19,7 +19,7 @@
 
 - name: Install Node service file
   template:
-    dest: "/etc/systemd/system/{{ openshift.common.service_type }}-node.service"
+    dest: "/etc/systemd/system/{{ openshift_service_type }}-node.service"
     src: "node.service.j2"
   register: l_node_unit
 
-- 
cgit v1.2.3