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.

10 files changed, 58 insertions, 58 deletions

diff --git a/roles/openshift_master/handlers/main.yml b/roles/openshift_master/handlers/main.yml
index e6b8b8ac8..557bfe022 100644
--- a/roles/openshift_master/handlers/main.yml
+++ b/roles/openshift_master/handlers/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: restart master api
   systemd:
-    name: "{{ openshift.common.service_type }}-master-api"
+    name: "{{ openshift_service_type }}-master-api"
     state: restarted
   when:
   - not (master_api_service_status_changed | default(false) | bool)
@@ -10,7 +10,7 @@
 
 # We retry the controllers because the API may not be 100% initialized yet.
 - name: restart master controllers
-  command: "systemctl restart {{ openshift.common.service_type }}-master-controllers"
+  command: "systemctl restart {{ openshift_service_type }}-master-controllers"
   retries: 3
   delay: 5
   register: result
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index 5f4e6df71..9be5508aa 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -16,7 +16,7 @@
 
 - name: Install Master package
   package:
-    name: "{{ openshift.common.service_type }}-master{{ openshift_pkg_version | default('') | oo_image_tag_to_rpm_version(include_dash=True) }}"
+    name: "{{ openshift_service_type }}-master{{ openshift_pkg_version | default('') | oo_image_tag_to_rpm_version(include_dash=True) }}"
     state: present
   when:
   - not openshift.common.is_containerized | bool
@@ -141,7 +141,7 @@
 # The template file will stomp any other settings made.
 - block:
   - name: check whether our docker-registry setting exists in the env file
-    command: "awk '/^OPENSHIFT_DEFAULT_REGISTRY=docker-registry.default.svc:5000/' /etc/sysconfig/{{ openshift.common.service_type }}-master"
+    command: "awk '/^OPENSHIFT_DEFAULT_REGISTRY=docker-registry.default.svc:5000/' /etc/sysconfig/{{ openshift_service_type }}-master"
     failed_when: false
     changed_when: false
     register: l_already_set
@@ -203,7 +203,7 @@
 
 - name: Start and enable master api on first master
   systemd:
-    name: "{{ openshift.common.service_type }}-master-api"
+    name: "{{ openshift_service_type }}-master-api"
     enabled: yes
     state: started
   when:
@@ -214,7 +214,7 @@
   delay: 60
 
 - name: Dump logs from master-api if it failed
-  command: journalctl --no-pager -n 100 -u {{ openshift.common.service_type }}-master-api
+  command: journalctl --no-pager -n 100 -u {{ openshift_service_type }}-master-api
   when:
   - l_start_result | failed
 
@@ -230,7 +230,7 @@
 
 - name: Start and enable master api all masters
   systemd:
-    name: "{{ openshift.common.service_type }}-master-api"
+    name: "{{ openshift_service_type }}-master-api"
     enabled: yes
     state: started
   when:
@@ -241,7 +241,7 @@
   delay: 60
 
 - name: Dump logs from master-api if it failed
-  command: journalctl --no-pager -n 100 -u {{ openshift.common.service_type }}-master-api
+  command: journalctl --no-pager -n 100 -u {{ openshift_service_type }}-master-api
   when:
   - l_start_result | failed
 
@@ -258,7 +258,7 @@
 
 - name: Start and enable master controller service
   systemd:
-    name: "{{ openshift.common.service_type }}-master-controllers"
+    name: "{{ openshift_service_type }}-master-controllers"
     enabled: yes
     state: started
   register: l_start_result
@@ -267,7 +267,7 @@
   delay: 60
 
 - name: Dump logs from master-controllers if it failed
-  command: journalctl --no-pager -n 100 -u {{ openshift.common.service_type }}-master-controllers
+  command: journalctl --no-pager -n 100 -u {{ openshift_service_type }}-master-controllers
   when:
   - l_start_result | failed
 
diff --git a/roles/openshift_master/tasks/restart.yml b/roles/openshift_master/tasks/restart.yml
index 4f8b758fd..715347101 100644
--- a/roles/openshift_master/tasks/restart.yml
+++ b/roles/openshift_master/tasks/restart.yml
@@ -1,7 +1,7 @@
 ---
 - name: Restart master API
   service:
-    name: "{{ openshift.common.service_type }}-master-api"
+    name: "{{ openshift_service_type }}-master-api"
     state: restarted
   when: openshift_master_ha | bool
 - name: Wait for master API to come back online
@@ -14,7 +14,7 @@
   when: openshift_master_ha | bool
 - name: Restart master controllers
   service:
-    name: "{{ openshift.common.service_type }}-master-controllers"
+    name: "{{ openshift_service_type }}-master-controllers"
     state: restarted
   # Ignore errrors since it is possible that type != simple for
   # pre-3.1.1 installations.
diff --git a/roles/openshift_master/tasks/system_container.yml b/roles/openshift_master/tasks/system_container.yml
index 450f6d803..f6c5ce0dd 100644
--- a/roles/openshift_master/tasks/system_container.yml
+++ b/roles/openshift_master/tasks/system_container.yml
@@ -8,12 +8,12 @@
 
 - name: Check Master system container package
   command: >
-    atomic containers list --no-trunc -a -f container={{ openshift.common.service_type }}-master
+    atomic containers list --no-trunc -a -f container={{ openshift_service_type }}-master
 
 # HA
 - name: Install or Update HA api master system container
   oc_atomic_container:
-    name: "{{ openshift.common.service_type }}-master-api"
+    name: "{{ openshift_service_type }}-master-api"
     image: "{{ 'docker:' if system_images_registry == 'docker' else system_images_registry + '/' }}{{ openshift.master.master_system_image }}:{{ openshift_image_tag }}"
     state: latest
     values:
@@ -21,7 +21,7 @@
 
 - name: Install or Update HA controller master system container
   oc_atomic_container:
-    name: "{{ openshift.common.service_type }}-master-controllers"
+    name: "{{ openshift_service_type }}-master-controllers"
     image: "{{ 'docker:' if system_images_registry == 'docker' else system_images_registry + '/' }}{{ openshift.master.master_system_image }}:{{ openshift_image_tag }}"
     state: latest
     values:
diff --git a/roles/openshift_master/tasks/systemd_units.yml b/roles/openshift_master/tasks/systemd_units.yml
index ee76413e3..76b6f46aa 100644
--- a/roles/openshift_master/tasks/systemd_units.yml
+++ b/roles/openshift_master/tasks/systemd_units.yml
@@ -13,7 +13,7 @@
 
 - name: Disable the legacy master service if it exists
   systemd:
-    name: "{{ openshift.common.service_type }}-master"
+    name: "{{ openshift_service_type }}-master"
     state: stopped
     enabled: no
     masked: yes
@@ -21,7 +21,7 @@
 
 - name: Remove the legacy master service if it exists
   file:
-    path: "{{ containerized_svc_dir }}/{{ openshift.common.service_type }}-master.service"
+    path: "{{ containerized_svc_dir }}/{{ openshift_service_type }}-master.service"
     state: absent
   ignore_errors: true
   when:
@@ -40,7 +40,7 @@
 - name: Create the ha systemd unit files
   template:
     src: "{{ ha_svc_template_path }}/atomic-openshift-master-{{ item }}.service.j2"
-    dest: "{{ containerized_svc_dir }}/{{ openshift.common.service_type }}-master-{{ item }}.service"
+    dest: "{{ containerized_svc_dir }}/{{ openshift_service_type }}-master-{{ item }}.service"
   when:
   - not l_is_master_system_container | bool
   with_items:
@@ -55,7 +55,7 @@
 
 - name: enable master services
   systemd:
-    name: "{{ openshift.common.service_type }}-master-{{ item }}"
+    name: "{{ openshift_service_type }}-master-{{ item }}"
     enabled: yes
   with_items:
   - api
@@ -64,13 +64,13 @@
   - not l_is_master_system_container | bool
 
 - name: Preserve Master API Proxy Config options
-  command: grep PROXY /etc/sysconfig/{{ openshift.common.service_type }}-master-api
+  command: grep PROXY /etc/sysconfig/{{ openshift_service_type }}-master-api
   register: l_master_api_proxy
   failed_when: false
   changed_when: false
 
 - name: Preserve Master API AWS options
-  command: grep AWS_ /etc/sysconfig/{{ openshift.common.service_type }}-master-api
+  command: grep AWS_ /etc/sysconfig/{{ openshift_service_type }}-master-api
   register: master_api_aws
   failed_when: false
   changed_when: false
@@ -78,7 +78,7 @@
 - name: Create the master api service env file
   template:
     src: "{{ ha_svc_template_path }}/atomic-openshift-master-api.j2"
-    dest: /etc/sysconfig/{{ openshift.common.service_type }}-master-api
+    dest: /etc/sysconfig/{{ openshift_service_type }}-master-api
     backup: true
   notify:
   - restart master api
@@ -89,7 +89,7 @@
   - "'http_proxy' not in openshift.common"
   - "'https_proxy' not in openshift.common"
   lineinfile:
-    dest: /etc/sysconfig/{{ openshift.common.service_type }}-master-api
+    dest: /etc/sysconfig/{{ openshift_service_type }}-master-api
     line: "{{ item }}"
   with_items: "{{ l_master_api_proxy.stdout_lines | default([]) }}"
 
@@ -98,19 +98,19 @@
   - master_api_aws.rc == 0
   - not (openshift_cloudprovider_kind is defined and openshift_cloudprovider_kind == 'aws' and openshift_cloudprovider_aws_access_key is defined and openshift_cloudprovider_aws_secret_key is defined)
   lineinfile:
-    dest: /etc/sysconfig/{{ openshift.common.service_type }}-master-api
+    dest: /etc/sysconfig/{{ openshift_service_type }}-master-api
     line: "{{ item }}"
   with_items: "{{ master_api_aws.stdout_lines | default([]) }}"
   no_log: True
 
 - name: Preserve Master Controllers Proxy Config options
-  command: grep PROXY /etc/sysconfig/{{ openshift.common.service_type }}-master-controllers
+  command: grep PROXY /etc/sysconfig/{{ openshift_service_type }}-master-controllers
   register: master_controllers_proxy
   failed_when: false
   changed_when: false
 
 - name: Preserve Master Controllers AWS options
-  command: grep AWS_ /etc/sysconfig/{{ openshift.common.service_type }}-master-controllers
+  command: grep AWS_ /etc/sysconfig/{{ openshift_service_type }}-master-controllers
   register: master_controllers_aws
   failed_when: false
   changed_when: false
@@ -118,14 +118,14 @@
 - name: Create the master controllers service env file
   template:
     src: "{{ ha_svc_template_path }}/atomic-openshift-master-controllers.j2"
-    dest: /etc/sysconfig/{{ openshift.common.service_type }}-master-controllers
+    dest: /etc/sysconfig/{{ openshift_service_type }}-master-controllers
     backup: true
   notify:
   - restart master controllers
 
 - name: Restore Master Controllers Proxy Config Options
   lineinfile:
-    dest: /etc/sysconfig/{{ openshift.common.service_type }}-master-controllers
+    dest: /etc/sysconfig/{{ openshift_service_type }}-master-controllers
     line: "{{ item }}"
   with_items: "{{ master_controllers_proxy.stdout_lines | default([]) }}"
   when:
@@ -135,7 +135,7 @@
 
 - name: Restore Master Controllers AWS Options
   lineinfile:
-    dest: /etc/sysconfig/{{ openshift.common.service_type }}-master-controllers
+    dest: /etc/sysconfig/{{ openshift_service_type }}-master-controllers
     line: "{{ item }}"
   with_items: "{{ master_controllers_aws.stdout_lines | default([]) }}"
   when:
diff --git a/roles/openshift_master/tasks/upgrade/rpm_upgrade.yml b/roles/openshift_master/tasks/upgrade/rpm_upgrade.yml
index caab3045a..f50b91ff5 100644
--- a/roles/openshift_master/tasks/upgrade/rpm_upgrade.yml
+++ b/roles/openshift_master/tasks/upgrade/rpm_upgrade.yml
@@ -12,11 +12,11 @@
   package: name={{ master_pkgs | join(',') }} state=present
   vars:
     master_pkgs:
-      - "{{ openshift.common.service_type }}{{ openshift_pkg_version }}"
-      - "{{ openshift.common.service_type }}-master{{ openshift_pkg_version }}"
-      - "{{ openshift.common.service_type }}-node{{ openshift_pkg_version }}"
-      - "{{ openshift.common.service_type }}-sdn-ovs{{ openshift_pkg_version }}"
-      - "{{ openshift.common.service_type }}-clients{{ openshift_pkg_version }}"
-      - "tuned-profiles-{{ openshift.common.service_type }}-node{{ openshift_pkg_version }}"
+      - "{{ openshift_service_type }}{{ openshift_pkg_version }}"
+      - "{{ openshift_service_type }}-master{{ openshift_pkg_version }}"
+      - "{{ openshift_service_type }}-node{{ openshift_pkg_version }}"
+      - "{{ openshift_service_type }}-sdn-ovs{{ openshift_pkg_version }}"
+      - "{{ openshift_service_type }}-clients{{ openshift_pkg_version }}"
+      - "tuned-profiles-{{ openshift_service_type }}-node{{ openshift_pkg_version }}"
   register: result
   until: result | success
diff --git a/roles/openshift_master/templates/docker-cluster/atomic-openshift-master-api.service.j2 b/roles/openshift_master/templates/docker-cluster/atomic-openshift-master-api.service.j2
index cec3d3fb1..5e46d9121 100644
--- a/roles/openshift_master/templates/docker-cluster/atomic-openshift-master-api.service.j2
+++ b/roles/openshift_master/templates/docker-cluster/atomic-openshift-master-api.service.j2
@@ -3,18 +3,18 @@ Description=Atomic OpenShift Master API
 Documentation=https://github.com/openshift/origin
 After=etcd_container.service
 Wants=etcd_container.service
-Before={{ openshift.common.service_type }}-node.service
+Before={{ openshift_service_type }}-node.service
 After={{ openshift_docker_service_name }}.service
 PartOf={{ openshift_docker_service_name }}.service
 Requires={{ openshift_docker_service_name }}.service
 
 [Service]
-EnvironmentFile=/etc/sysconfig/{{ openshift.common.service_type }}-master-api
+EnvironmentFile=/etc/sysconfig/{{ openshift_service_type }}-master-api
 Environment=GOTRACEBACK=crash
-ExecStartPre=-/usr/bin/docker rm -f {{ openshift.common.service_type}}-master-api
+ExecStartPre=-/usr/bin/docker rm -f {{ openshift_service_type}}-master-api
 ExecStart=/usr/bin/docker run --rm --privileged --net=host \
-  --name {{ openshift.common.service_type }}-master-api \
-  --env-file=/etc/sysconfig/{{ openshift.common.service_type }}-master-api \
+  --name {{ openshift_service_type }}-master-api \
+  --env-file=/etc/sysconfig/{{ openshift_service_type }}-master-api \
   -v {{ r_openshift_master_data_dir }}:{{ r_openshift_master_data_dir }} \
   -v /var/log:/var/log -v /var/run/docker.sock:/var/run/docker.sock \
   -v {{ openshift.common.config_base }}:{{ openshift.common.config_base }} \
@@ -24,14 +24,14 @@ ExecStart=/usr/bin/docker run --rm --privileged --net=host \
   {{ openshift.master.master_image }}:${IMAGE_VERSION} start master api \
   --config=${CONFIG_FILE} $OPTIONS
 ExecStartPost=/usr/bin/sleep 10
-ExecStop=/usr/bin/docker stop {{ openshift.common.service_type }}-master-api
+ExecStop=/usr/bin/docker stop {{ openshift_service_type }}-master-api
 LimitNOFILE=131072
 LimitCORE=infinity
 WorkingDirectory={{ r_openshift_master_data_dir }}
-SyslogIdentifier={{ openshift.common.service_type }}-master-api
+SyslogIdentifier={{ openshift_service_type }}-master-api
 Restart=always
 RestartSec=5s
 
 [Install]
 WantedBy={{ openshift_docker_service_name }}.service
-WantedBy={{ openshift.common.service_type }}-node.service
+WantedBy={{ openshift_service_type }}-node.service
diff --git a/roles/openshift_master/templates/docker-cluster/atomic-openshift-master-controllers.service.j2 b/roles/openshift_master/templates/docker-cluster/atomic-openshift-master-controllers.service.j2
index a0248151d..899575f1a 100644
--- a/roles/openshift_master/templates/docker-cluster/atomic-openshift-master-controllers.service.j2
+++ b/roles/openshift_master/templates/docker-cluster/atomic-openshift-master-controllers.service.j2
@@ -1,19 +1,19 @@
 [Unit]
 Description=Atomic OpenShift Master Controllers
 Documentation=https://github.com/openshift/origin
-Wants={{ openshift.common.service_type }}-master-api.service
-After={{ openshift.common.service_type }}-master-api.service
+Wants={{ openshift_service_type }}-master-api.service
+After={{ openshift_service_type }}-master-api.service
 After={{ openshift_docker_service_name }}.service
 Requires={{ openshift_docker_service_name }}.service
 PartOf={{ openshift_docker_service_name }}.service
 
 [Service]
-EnvironmentFile=/etc/sysconfig/{{ openshift.common.service_type }}-master-controllers
+EnvironmentFile=/etc/sysconfig/{{ openshift_service_type }}-master-controllers
 Environment=GOTRACEBACK=crash
-ExecStartPre=-/usr/bin/docker rm -f {{ openshift.common.service_type}}-master-controllers
+ExecStartPre=-/usr/bin/docker rm -f {{ openshift_service_type}}-master-controllers
 ExecStart=/usr/bin/docker run --rm --privileged --net=host \
-  --name {{ openshift.common.service_type }}-master-controllers \
-  --env-file=/etc/sysconfig/{{ openshift.common.service_type }}-master-controllers \
+  --name {{ openshift_service_type }}-master-controllers \
+  --env-file=/etc/sysconfig/{{ openshift_service_type }}-master-controllers \
   -v {{ r_openshift_master_data_dir }}:{{ r_openshift_master_data_dir }} \
   -v /var/run/docker.sock:/var/run/docker.sock \
   -v {{ openshift.common.config_base }}:{{ openshift.common.config_base }} \
@@ -23,11 +23,11 @@ ExecStart=/usr/bin/docker run --rm --privileged --net=host \
   {{ openshift.master.master_image }}:${IMAGE_VERSION} start master controllers \
   --config=${CONFIG_FILE} $OPTIONS
 ExecStartPost=/usr/bin/sleep 10
-ExecStop=/usr/bin/docker stop {{ openshift.common.service_type }}-master-controllers
+ExecStop=/usr/bin/docker stop {{ openshift_service_type }}-master-controllers
 LimitNOFILE=131072
 LimitCORE=infinity
 WorkingDirectory={{ r_openshift_master_data_dir }}
-SyslogIdentifier={{ openshift.common.service_type }}-master-controllers
+SyslogIdentifier={{ openshift_service_type }}-master-controllers
 Restart=always
 RestartSec=5s
 
diff --git a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.service.j2 b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.service.j2
index 02bfd6f62..ed8a47df8 100644
--- a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.service.j2
+++ b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.service.j2
@@ -3,12 +3,12 @@ Description=Atomic OpenShift Master API
 Documentation=https://github.com/openshift/origin
 After=network-online.target
 After=etcd.service
-Before={{ openshift.common.service_type }}-node.service
+Before={{ openshift_service_type }}-node.service
 Requires=network-online.target
 
 [Service]
 Type=notify
-EnvironmentFile=/etc/sysconfig/{{ openshift.common.service_type }}-master-api
+EnvironmentFile=/etc/sysconfig/{{ openshift_service_type }}-master-api
 Environment=GOTRACEBACK=crash
 ExecStart=/usr/bin/openshift start master api --config=${CONFIG_FILE} $OPTIONS
 LimitNOFILE=131072
@@ -20,4 +20,4 @@ RestartSec=5s
 
 [Install]
 WantedBy=multi-user.target
-WantedBy={{ openshift.common.service_type }}-node.service
+WantedBy={{ openshift_service_type }}-node.service
diff --git a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.service.j2 b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.service.j2
index fae021845..b36963f73 100644
--- a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.service.j2
+++ b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.service.j2
@@ -2,19 +2,19 @@
 Description=Atomic OpenShift Master Controllers
 Documentation=https://github.com/openshift/origin
 After=network-online.target
-After={{ openshift.common.service_type }}-master-api.service
-Wants={{ openshift.common.service_type }}-master-api.service
+After={{ openshift_service_type }}-master-api.service
+Wants={{ openshift_service_type }}-master-api.service
 Requires=network-online.target
 
 [Service]
 Type=notify
-EnvironmentFile=/etc/sysconfig/{{ openshift.common.service_type }}-master-controllers
+EnvironmentFile=/etc/sysconfig/{{ openshift_service_type }}-master-controllers
 Environment=GOTRACEBACK=crash
 ExecStart=/usr/bin/openshift start master controllers --config=${CONFIG_FILE} $OPTIONS
 LimitNOFILE=131072
 LimitCORE=infinity
 WorkingDirectory={{ r_openshift_master_data_dir }}
-SyslogIdentifier={{ openshift.common.service_type }}-master-controllers
+SyslogIdentifier={{ openshift_service_type }}-master-controllers
 Restart=always
 RestartSec=5s