Bläddra i källkod

Continue homedir work

Zach Isbach 4 år sedan
förälder
incheckning
f62712d741
5 ändrade filer med 25 tillägg och 13 borttagningar
  1. 2 1
      hosts.ini
  2. 1 1
      plays/gluster/vols.yaml
  3. 14 9
      plays/work/start.yaml
  4. 1 0
      roles/updates/tasks/main.yml
  5. 7 2
      tls/bin/genCA.sh

+ 2 - 1
hosts.ini

@@ -5,6 +5,7 @@ localhost ansible_connection=local ansible_python_interpreter=/opt/local/bin/pyt
 gluster
 gluster_clients
 docker_reg
+work
 
 [all:vars]
 ansible_user=ubuntu
@@ -70,7 +71,7 @@ ec2_launch_pub_ip=True
 gluster_tls_name=docker_registry
 
 [work]
-registry.docker.aws.zi3.fi
+marsea.work.aws.zi3.fi
 
 [work:vars]
 domain=work

+ 1 - 1
plays/gluster/vols.yaml

@@ -7,7 +7,7 @@
     gluster_allow_nginx: "{{ gluster_nodes }},docker_registry"
   roles:
     - { role: gluster_lvm_vol,
-          gluster_lvm_vol_name: zib_home,
+          gluster_lvm_vol_name: zib,
           docker_lvm_vol_size: 1G,
           gluster_lvm_vol_sslallow: "nodeA,nodeB,work-marsea"
       }

+ 14 - 9
plays/work/start.yaml

@@ -8,6 +8,7 @@
 
 - name: Initial setup
   hosts: work
+  become: yes
   vars:
     hostname_domain: "{{ aws_tag_name }}.{{ route53_zone }}"
     hostname_fqdn: "{{ aws_tag_value }}.{{ hostname_domain }}"
@@ -28,21 +29,24 @@
 
 - name: Mount gluster homedir
   hosts: work
+  become: yes
   vars:
     gluster_mnt_srv: "{{ groups.gluster | first }}"
-    gluster_mnt_bkp: "{{ groups.gluster | join(:) }}"
+    gluster_mnt_bkp: "{{ groups.gluster | join(':') }}"
   roles:
     - key_store
     - gluster
-    - { role: add_group, add_group_groups: zib_home }
     - { role: gluster_mnt,
-        gluster_mnt_vol: zib_home,
-        gluster_mnt_mode: '0770'
+        gluster_mnt_vol: zib,
+        gluster_mnt_path: /home/zib,
+        gluster_mnt_mode: '0750',
+	gluster_mnt_owner: zib,
       }
     - base_user
 
 - name: Install docker
   hosts: work
+  become: yes
   vars:
     docker_run: true
     docker_glusterfs_servers: "{{ groups.gluster | join(',') }}"
@@ -52,18 +56,19 @@
 
 - name: Additional mounts
   hosts: work
+  become: yes
   vars:
     gluster_mnt_srv: "{{ groups.gluster | first }}"
-    gluster_mnt_bkp: "{{ groups.gluster | join(:) }}"
+    gluster_mnt_bkp: "{{ groups.gluster | join(':') }}"
   roles:
     - { role: add_group, add_group_groups: 'letsencrypt,nginx,docker_registry' }
     - { role: gluster_mnt,
         gluster_mnt_vol: nginx,
-        gluster_mnt_path: /home/zib/live/nginx
-        gluster_mnt_mode: '0770'
+        gluster_mnt_path: /home/zib/live/nginx,
+        gluster_mnt_mode: '0770',
       }
     - { role: gluster_mnt,
         gluster_mnt_vol: letsencrypt,
-        gluster_mnt_path: /home/zib/live/letsencrypt
-        gluster_mnt_mode: '0770'
+        gluster_mnt_path: /home/zib/live/letsencrypt,
+        gluster_mnt_mode: '0770',
       }

+ 1 - 0
roles/updates/tasks/main.yml

@@ -1,6 +1,7 @@
 - name: Workaround arm64 repo issue
   ansible.builtin.lineinfile:
     path: /etc/apt/apt.conf.d/99phased-updates
+    create: yes
     state: present
     insertbefore: BOF
     line: 'APT::Get::Always-Include-Phased-Updates 1;'

+ 7 - 2
tls/bin/genCA.sh

@@ -55,6 +55,11 @@ else
   PRE_DIR=""
 fi
 
+# Support alternate OUs
+if [ -z "${OU}" ]; then
+	OU="${INTER}"
+fi
+
 # Calculate all our file paths
 CONF="openssl.conf"
 CA_CERT="${PRE_DIR}${CA_NAME}.pem"
@@ -103,8 +108,8 @@ if [ $GEN_CA -gt 0 ]; then
 fi
 
 # Pick a subject
-if [ -n "${INTER}" ]; then
-  SUBJECT="/O=${ORG}/OU=${INTER}/CN=${CN}"
+if [ -n "${OU}" ]; then
+  SUBJECT="/O=${ORG}/OU=${OU}/CN=${CN}"
 else
   SUBJECT="/O=${ORG}/CN=${CN}"
 fi