Merge branch 'devel' into patch-1

control_plane/roles/provision_cobbler/files/Dockerfile_leap

@@ -65,7 +65,6 @@ EXPOSE 69 80 443 25151
 
 VOLUME [ "/srv/www/cobbler", "/var/lib/cobbler/backup", "/mnt" ]
 
-RUN systemctl enable apache2
 RUN systemctl enable dhcpd
 
 CMD ["sbin/init"]

control_plane/roles/provision_cobbler/files/cobbler_configurations_leap.yml

@@ -44,6 +44,27 @@
     shell: echo "LoadModule wsgi_module modules/mod_wsgi_python3.so" >/etc/apache2/conf.d/wsgi.conf
     changed_when: false
 
+  - name: Change http port to 8000
+    replace:
+      path: "/etc/apache2/listen.conf"
+      regexp: '^Listen 80'
+      replace: 'Listen 8000'
+    changed_when: false
+
+  - name: Change https port to 8008
+    replace:
+      path: "/etc/apache2/listen.conf"
+      regexp: '^\s.*Listen 443'
+      replace: '                Listen 8008'
+    changed_when: false
+
+  - name: Change http port to 8000
+    replace:
+      path: "/etc/apache2/vhosts.d/cobbler.conf"
+      regexp: '^<VirtualHost.*'
+      replace: '<VirtualHost *:8000>'
+    changed_when: false
+
   - name: Add interface to the /etc/sysconfig/dhcpd
     replace:
       path: "/etc/sysconfig/dhcpd"
@@ -55,6 +76,7 @@
     with_items:
       - cobblerd
       - tftp
+      - apache2
     changed_when: false
 
   - name: Restart httpd

control_plane/roles/provision_cobbler/files/temp_leap15.xml

@@ -5,7 +5,7 @@
     <init>
       <info_file>
         <![CDATA[
-          install: http://ip/cblr/links/leap-x86_64/
+          install: http://ip:port/cblr/links/leap-x86_64/
           textmode: 1]]>
       </info_file>
     </init>

control_plane/roles/provision_cobbler/tasks/provision_password.yml

@@ -105,7 +105,7 @@
       replace:
         path: "{{ role_path }}/files/{{ cobbler_kickstart_file }}"
         regexp: '^          install: http://ip/cblr/links/leap-x86_64/'
-        replace: '          install: http://{{ hpc_ip }}/cblr/links/leap-x86_64/'
+        replace: '          install: http://{{ hpc_ip }}:{{ http_port }}/cblr/links/leap-x86_64/'
       tags: install
 
     - name: Configure kickstart file leap - nic

docs/_config.yml

@@ -1,4 +1,4 @@
-theme: jekyll-theme-minimal
+theme: jekyll-theme-dinky
 title: Omnia
 description: Ansible playbook-based tools for deploying Slurm and Kubernetes clusters for High Performance Computing, Machine Learning, Deep Learning, and High-Performance Data Analytics
 logo: images/omnia-logo.png

roles/cluster_validation/vars/main.yml

@@ -92,3 +92,9 @@ alert_email_fail_msg: "Failed. Incorrect alert_email_address value in security_v
 alert_email_warning_msg: "[WARNING] alert_email_address is empty. Authentication failure alerts won't be configured."
 email_max_length: 320
 email_search_key: "@"
+login_node_security_success_msg: "Login node security successfully validated"
+login_node_security_fail_msg: "Failed. Incorrect Login node security format in security_vars.yml"
+user_success_msg: "user successfully validated"
+user_fail_msg: "Failed. Incorrect user format in security_vars.yml"
+allow_deny_success_msg: "Access successfully validated"
+allow_deny_fail_msg: "Failed. Incorrect Access format in security_vars.yml"