summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Carter <kevin.carter@rackspace.com>2018-09-30 10:00:05 -0500
committerKevin Carter <kevin.carter@rackspace.com>2018-09-30 10:00:05 -0500
commit45bb9631b1e2ec8c460e87af213c97746c6ac645 (patch)
treed9d4586019786e1efcdebd8de7169e094a0f749d
parentf34f241c37e4faa1d8317e89bd4490144d36a70e (diff)
Add variable for the ssh service
The ssh service on ubuntu based systems is "ssh" which is established by the service unit path `/lib/systemd/system/ssh.service`. When running the service will respond to the name "sshd" however this is just an alias. This change adds a variable to set the service unit name based on the distro family which will allow the service to start should it be masked. Change-Id: I04b9f5ed761270c0bb76b607a6562b511c6f4773 Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
Notes
Notes (review): Code-Review+2: Jesse Pretorius (odyssey4me) <jesse.pretorius@rackspace.co.uk> Code-Review+2: Markos Chandras (hwoarang) <mchandras@suse.de> Workflow+1: Markos Chandras (hwoarang) <mchandras@suse.de> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Mon, 01 Oct 2018 11:52:52 +0000 Reviewed-on: https://review.openstack.org/606847 Project: openstack/openstack-ansible-repo_server Branch: refs/heads/master
-rw-r--r--tasks/repo_post_install.yml3
-rw-r--r--vars/debian.yml2
-rw-r--r--vars/redhat.yml2
-rw-r--r--vars/suse.yml2
4 files changed, 7 insertions, 2 deletions
diff --git a/tasks/repo_post_install.yml b/tasks/repo_post_install.yml
index 2312e9f..465d6cd 100644
--- a/tasks/repo_post_install.yml
+++ b/tasks/repo_post_install.yml
@@ -30,7 +30,7 @@
30 30
31- name: Enable SSHD 31- name: Enable SSHD
32 systemd: 32 systemd:
33 name: sshd 33 name: "{{ repo_server_sshd }}"
34 state: started 34 state: started
35 enabled: yes 35 enabled: yes
36 masked: no 36 masked: no
@@ -86,4 +86,3 @@
86 config_type: "ini" 86 config_type: "ini"
87 notify: 87 notify:
88 - reload pypiserver 88 - reload pypiserver
89
diff --git a/vars/debian.yml b/vars/debian.yml
index 9b1b3de..a59c055 100644
--- a/vars/debian.yml
+++ b/vars/debian.yml
@@ -32,3 +32,5 @@ repo_pkg_cache_server_distro_packages:
32 32
33repo_lsyncd_config_file: /etc/lsyncd/lsyncd.conf.lua 33repo_lsyncd_config_file: /etc/lsyncd/lsyncd.conf.lua
34repo_lsyncd_defaults_file: /etc/default/lsyncd 34repo_lsyncd_defaults_file: /etc/default/lsyncd
35
36repo_server_sshd: ssh
diff --git a/vars/redhat.yml b/vars/redhat.yml
index 71c5203..d2017fa 100644
--- a/vars/redhat.yml
+++ b/vars/redhat.yml
@@ -34,3 +34,5 @@ repo_pkg_cache_server_distro_packages:
34 34
35repo_lsyncd_config_file: /etc/lsyncd.conf 35repo_lsyncd_config_file: /etc/lsyncd.conf
36repo_lsyncd_defaults_file: /etc/sysconfig/lsyncd 36repo_lsyncd_defaults_file: /etc/sysconfig/lsyncd
37
38repo_server_sshd: sshd
diff --git a/vars/suse.yml b/vars/suse.yml
index e9a4468..52867be 100644
--- a/vars/suse.yml
+++ b/vars/suse.yml
@@ -33,3 +33,5 @@ repo_pkg_cache_server_distro_packages:
33 33
34repo_lsyncd_config_file: /etc/lsyncd/lsyncd.conf 34repo_lsyncd_config_file: /etc/lsyncd/lsyncd.conf
35repo_lsyncd_defaults_file: /etc/sysconfig/lsyncd 35repo_lsyncd_defaults_file: /etc/sysconfig/lsyncd
36
37repo_server_sshd: sshd