Deprecate Ubuntu 14.04

PNDA-4525

salt/ambari/agent.sls

@@ -6,13 +6,11 @@ ambari-agent-user:
     - groups:
       - root
 
-{% if grains['os'] in ('RedHat', 'CentOS') %}
 ambari-agent-libtirpc:
   pkg.installed:
     - name: {{ pillar['libtirpc-devel']['package-name'] }}
     - version: {{ pillar['libtirpc-devel']['version'] }}
     - ignore_epoch: True
-{%- endif %}
 
 ambari-agent-pkg:
   pkg.installed:
@@ -34,28 +32,9 @@ ambari-agent-create_log_dir:
     - name: /var/log/pnda/ambari/
     - makedirs: True
 
-{% if grains['os'] in ('RedHat', 'CentOS') %}
 ambari-agent-systemctl_reload:
   cmd.run:
     - name: /bin/systemctl daemon-reload; /bin/systemctl enable ambari-agent
-{%- endif %}
-
-{% if grains['os'] == 'Ubuntu' %}
-# See AMBARI-22532, and remove this work around when that is resolved
-ambari-agent-patchfix1:
-  file.replace:
-    - name: /usr/lib/ambari-agent/lib/resource_management/core/providers/package/apt.py
-    - pattern: '^.*if repo_id in package\[2\]:'
-    - repl: '          if urllib.unquote(repo_id).decode("utf-8") in urllib.unquote(package[2]).decode("utf-8"):'
-
-ambari-agent-patchfix2:
-  file.replace:
-    - name: /usr/lib/ambari-agent/lib/resource_management/core/providers/package/apt.py
-    - pattern: 'import subprocess'
-    - repl: |
-        import subprocess
-        import urllib
-{% endif %}
 
 ambari-agent-start_service:
   cmd.run:

salt/ambari/server.sls

@@ -89,11 +89,9 @@ ambari-server-jdbc-dl:
     - source: {{ mirror_location }}/{{ jdbc_package }}
     - source_hash: {{ mirror_location }}/{{ jdbc_package }}.sha512.txt
 
-{% if grains['os'] in ('RedHat', 'CentOS') %}
 ambari-server-systemctl_reload:
   cmd.run:
     - name: /bin/systemctl daemon-reload; /bin/systemctl enable ambari-server
-{%- endif %}
 
 ambari-server-setup_init:
   cmd.run:
@@ -155,23 +153,6 @@ ambari-server-setup_mysql:
   cmd.run:
     - name: 'ambari-server setup --jdbc-db=mysql --jdbc-driver=/usr/share/java/mysql-connector-java.jar; ambari-server setup --jdbc-db=bdb --jdbc-driver=/opt/pnda/jdbc-driver/{{ jdbc_package }}'
 
-{% if grains['os'] == 'Ubuntu' %}
-# See AMBARI-22532, and remove this work around when that is resolved
-ambari-server-patchfix1:
-  file.replace:
-    - name: /usr/lib/ambari-server/lib/resource_management/core/providers/package/apt.py
-    - pattern: '^.*if repo_id in package\[2\]:'
-    - repl: '          if urllib.unquote(repo_id).decode("utf-8") in urllib.unquote(package[2]).decode("utf-8"):'
-
-ambari-server-patchfix2:
-  file.replace:
-    - name: /usr/lib/ambari-server/lib/resource_management/core/providers/package/apt.py
-    - pattern: 'import subprocess'
-    - repl: |
-        import subprocess
-        import urllib
-{% endif %}
-
 ambari-server-start_service:
   cmd.run:
     - name: 'service ambari-server stop || echo already stopped; service ambari-server start'

salt/anaconda/init.sls

@@ -6,15 +6,12 @@
 {% set anaconda_package = 'Anaconda2-' + anaconda_bundle_version + '-Linux-x86_64.sh' %}
 {% set anaconda_link = install_dir + '/anaconda' %}
 
-{% if grains['os'] in ('RedHat', 'CentOS') %}
 anaconda-deps:
   pkg.installed:
     - name: {{ pillar['bzip2']['package-name'] }}
     - version: {{ pillar['bzip2']['version'] }}
     - ignore_epoch: True
 
-{%- endif %}
-
 anaconda-dir:
   file.directory:
     - name: {{ install_dir }}

salt/app-packages/init.sls

@@ -5,13 +5,11 @@
 include:
   - python-pip
 
-{% if grains['os'] in ('RedHat', 'CentOS') %}
 app-packages-install_dev_deps_cyrus:
   pkg.installed:
     - name: {{ pillar['cyrus-sasl-devel']['package-name'] }}
     - version: {{ pillar['cyrus-sasl-devel']['version'] }}
     - ignore_epoch: True
-{% endif %}
 
 app-packages-install_dev_deps_sasl:
   pkg.installed:

salt/cdh/cloudera-manager.sls

@@ -20,11 +20,9 @@ cloudera-manager-install_server:
     - name: {{ pillar['cloudera-manager-server']['package-name'] }}
     - version: {{ pillar['cloudera-manager-server']['version'] }}
 
-{% if grains['os'] in ('RedHat', 'CentOS') %}
 cloudera-manager-ensure_cloudera_manager_enabled:
   cmd.run:
     - name: /bin/systemctl enable cloudera-scm-server
-{% endif %}
 
 cloudera-manager-create_ext_db:
   cmd.run:

salt/console-backend/data-logger.sls

@@ -56,33 +56,22 @@ console-backend-install_backend_data_logger_app_dependencies:
 # Create service script from template
 console-backend-copy_data_logger_service:
   file.managed:
-{% if grains['os'] == 'Ubuntu' %}
-    - name: /etc/init/data-logger.conf
-    - source: salt://console-backend/templates/backend_nodejs_app.conf.tpl
-{% elif grains['os'] in ('RedHat', 'CentOS') %}
     - name: /usr/lib/systemd/system/data-logger.service
     - source: salt://console-backend/templates/backend_nodejs_app.service.tpl
-{% endif %}
     - template: jinja
     - defaults:
         no_console_log: True
         host_ip: {{ host_ip }}
         backend_app_port: {{ backend_app_port }}
         app_dir: {{ app_dir }}
 
-{% if grains['os'] in ('RedHat', 'CentOS') %}
 console-backend-data-logger-systemctl_reload:
   cmd.run:
     - name: /bin/systemctl daemon-reload; /bin/systemctl enable data-logger; /bin/systemctl enable redis
-{%- endif %}
 
 console-backend-redis_start:
   cmd.run:
-{% if grains['os'] == 'Ubuntu' %}
-    - name: 'service redis-server stop || echo already stopped; service redis-server start'
-{% elif grains['os'] in ('RedHat', 'CentOS') %}
     - name: 'service redis stop || echo already stopped; service redis start'
-{% endif %}
 
 console-backend-data-logger-start_service:
   cmd.run:

salt/console-backend/data-manager.sls

@@ -87,24 +87,17 @@ console-backend-install_backend_app_dependencies:
 # Create service script from template
 console-backend-copy_service:
   file.managed:
-{% if grains['os'] == 'Ubuntu' %}
-    - name: /etc/init/data-manager.conf
-    - source: salt://console-backend/templates/backend_nodejs_app.conf.tpl
-{% elif grains['os'] in ('RedHat', 'CentOS') %}
     - name: /usr/lib/systemd/system/data-manager.service
     - source: salt://console-backend/templates/backend_nodejs_app.service.tpl
-{% endif %}
     - template: jinja
     - defaults:
         host_ip: {{ host_ip }}
         backend_app_port: {{ backend_app_port }}
         app_dir: {{ app_dir }}
 
-{% if grains['os'] in ('RedHat', 'CentOS') %}
 console-backend-data-manager-systemctl_reload:
   cmd.run:
     - name: /bin/systemctl daemon-reload; /bin/systemctl enable data-manager
-{%- endif %}
 
 console-backend-data-manager-start_service:
   cmd.run:

salt/console-frontend/init.sls

@@ -1,11 +1,7 @@
 {% set packages_server = pillar['packages_server']['base_uri'] %}
 {% set console_frontend_version = pillar['console_frontend']['release_version'] %}
 {% set console_frontend_package = 'console-frontend-' + console_frontend_version + '.tar.gz' %}
-{% if grains['os'] == 'Ubuntu' %}
-{% set nginx_config_location = '/etc/nginx/sites-enabled' %}
-{% elif grains['os'] in ('RedHat', 'CentOS') %}
 {% set nginx_config_location = '/etc/nginx/conf.d' %}
-{% endif %}
 {% set install_dir = pillar['pnda']['homedir'] %}
 {% set console_dir = install_dir + '/console-frontend' %}
 {% set console_config_dir = console_dir + '/conf' %}
@@ -53,11 +49,7 @@ console-frontend-dl-and-extract:
     - source: {{ packages_server }}/{{ console_frontend_package }}
     - source_hash: {{ packages_server }}/{{ console_frontend_package }}.sha512.txt
     - user: root
-{% if grains['os'] == 'Ubuntu' %}
-    - group: www-data
-{% elif grains['os'] in ('RedHat', 'CentOS') %}
     - group: nginx
-{% endif %}
     - archive_format: tar
     - tar_options: --strip-components=1
     - if_missing: {{ console_dir }}-{{ console_frontend_version }}
@@ -126,11 +118,9 @@ console-frontend-remove_nginx_default_config:
   file.absent:
     - name: {{nginx_config_location}}/default
 
-{% if grains['os'] in ('RedHat', 'CentOS') %}
 console-frontend-systemctl_reload:
   cmd.run:
     - name: /bin/systemctl daemon-reload; /bin/systemctl enable nginx
-{%- endif %}
 
 console-frontend-start_service:
   cmd.run:

salt/consul/dns.sls

@@ -1,5 +1,4 @@
 {% set domain_name = pillar['consul']['node'] + '.' + pillar['consul']['data_center'] + '.' + pillar['consul']['domain'] %}
-{% if grains['os'] in ('RedHat', 'CentOS') %}
 
 consul_dns-add-nameserver:
   file.prepend:
@@ -25,24 +24,3 @@ consul_turn-off-peer-dns-{{ cfg_file }}:
 consul_prevent-modify-resolv-conf:
   cmd.run:
     - name: chattr +i /etc/resolv.conf
-
-{% else %}
-
-consul_dns-add-nameserver:
-  file.append:
-    - name: /etc/resolvconf/resolv.conf.d/head
-    - text: |
-{%- for ip in salt['pnda.dns_nameserver_ips']() %}
-        nameserver {{ ip }}
-{%- endfor %}
-
-consul_dns-add-domain:
-  file.append:
-    - name: /etc/resolvconf/resolv.conf.d/base
-    - text: 'search {{ domain_name }}'
-
-consul_refresh-resolv-conf:
-  cmd.run:
-    - name: resolvconf -u
-
-{% endif %}

salt/data-service/init.sls

@@ -52,22 +52,15 @@ data-service-copy_config:
 
 data-service-copy_service:
   file.managed:
-{% if grains['os'] == 'Ubuntu' %}
-    - name: /etc/init/dataservice.conf
-    - source: salt://data-service/templates/data-service.conf.tpl
-{% elif grains['os'] in ('RedHat', 'CentOS') %}
     - name: /usr/lib/systemd/system/dataservice.service
     - source: salt://data-service/templates/data-service.service.tpl
-{%- endif %}
     - template: jinja
     - defaults:
         install_dir: {{ install_dir }}
 
-{% if grains['os'] in ('RedHat', 'CentOS') %}
 data-service-systemctl_reload:
   cmd.run:
     - name: /bin/systemctl daemon-reload; /bin/systemctl enable dataservice
-{%- endif %}
 
 data-service-start_service:
   cmd.run: