merging devel branch

Former-commit-id: efe5fc40

CICD/heat/gc_HOT.yaml

@@ -13,7 +13,11 @@ parameters:
     type: string
     label: Image ID
     description: Centos Image
+<<<<<<< HEAD
     default: c47c3acb-9657-4243-9e14-e6c676157e3b #with Networkmanager
+=======
+    default: c47c3acb-9657-4243-9e14-e6c676157e3b #with NetworkManager
+>>>>>>> origin/devel
   ssh_key:
     type: string
     default: gc_key
@@ -104,7 +108,7 @@ resources:
     name:
      list_join: [ '-', [ { get_param: "OS::stack_name" }, 'sql0' ]]
     availability_zone: { get_param: avz }
-    flavor: t3.small
+    flavor: m3.xsmall
     image: { get_param: centos_7_image_id }
     key_name: { get_param: ssh_key }
     security_groups: [ { get_resource: SSHMonashSecGroup }, { get_resource: SlurmSecGroup }, { get_resource: MySQLSecGroup }, { get_resource: NFSSecGroup } ]
@@ -170,12 +174,12 @@ resources:
   LoginNodes:
    type: "OS::Heat::ResourceGroup"
    properties:
-    count: 1
+    count: 0
     resource_def:
      type: "OS::Nova::Server"
      properties:
       #availability_zone: { get_param: avz }
-      flavor: t3.small
+      flavor: m3.xsmall
       image: { get_param: centos_7_image_id }
       key_name: { get_param: ssh_key }
       name:
@@ -196,7 +200,7 @@ resources:
      type: "OS::Nova::Server"
      properties:
       #availability_zone: { get_param: avz }
-      flavor: t3.small
+      flavor: m3.xsmall
       image: { get_param: centos_7_image_id }
       key_name: { get_param: ssh_key }
       name:
@@ -217,7 +221,7 @@ resources:
      type: "OS::Nova::Server"
      properties:
       #availability_zone: { get_param: avz }
-      flavor: t3.small
+      flavor: m3.xsmall
       image: { get_param: centos_7_image_id }
       key_name: { get_param: ssh_key }
       name:
@@ -238,7 +242,7 @@ resources:
      type: "OS::Nova::Server"
      properties:
       #availability_zone: { get_param: avz }
-      flavor: t3.small
+      flavor: m3.xsmall
       image: { get_param: ubuntu_1804_image_id }
       key_name: { get_param: ssh_key }
       name:

CICD/heat/mgmtnode_HOT.yaml

@@ -25,7 +25,7 @@ resources:
     type: OS::Nova::Server
     properties:
       #availability_zone: { get_param: avz }
-      flavor: t3.xsmall
+      flavor: m3.xsmall
       image: { get_param: image }
       key_name: { get_param: ssh_key }
       security_groups: { get_param: security_groups }

CICD/vars/vars.yml

@@ -3,6 +3,17 @@ sudo_group: systems
 nagios_home: "/var/lib/nagios"
 nvidia_version: "390.46"
 
+yumdisablerepo: 
+ - 'base'
+ - 'extras'
+ - 'updates'
+yumenablerepo: 
+ - 'monashhpc_base'
+ - 'monashhpc_updates'
+ - 'monashhpc_extras'
+ - 'monashhpc_centosplus'
+ - 'monashhpc_otherstuff'
+
 gpumap:
  'K1': 'K1'
  'K80': 'K80'

roles/calculateEtcHosts/tasks/main.yml

@@ -8,7 +8,7 @@
 - name: make hosts data
   command: /tmp/makehosts.py /tmp/groups {{ domain }}
   register: hosts_data
-               
+
 - name: write hosts file
   template: dest=/tmp/etcHosts src=etcHosts.j2
 

roles/calculateEtcHosts/templates/etcHosts.j2

@@ -4,8 +4,6 @@ fe00::0 ip6-localnet
 ff00::0 ip6-mcastprefix
 ff02::1 ip6-allnodes
 ff02::2 ip6-allrouters
-118.138.241.196 hpcldap0.erc.monash.edu.au
-118.138.244.7 consistency0
 
 {% for item in hosts_data.stdout_lines %}
 {{ item }}

roles/config_repos/defaults/main.yml

+---
+# default variables for  config_repos
+
+reposervername: consistency0
+reposerverip: 118.138.244.7

roles/config_repos/tasks/main.yml

 ---
 
 - name: make sure out repo server is resolvable
-  lineinfile: 
-    dest: /etc/hosts 
-    line: "118.138.244.7 consistency0"
+  lineinfile:
+    dest: /etc/hosts
+    line: "{{ reposerverip }} {{ reposervername }}"  #this is duplicated in the role calculateEtcHosts
     owner: root
     group: root
+  become: true
 
 
 #- name: remove default repos
@@ -32,7 +33,7 @@
 #  when: ansible_os_family == 'RedHat' and ansible_distribution_major_version == "7"
 
 - name: add our repos
-  copy: src={{ item }} dest=/etc/yum.repos.d/{{ item }}
+  template: src={{ item }}.j2 dest=/etc/yum.repos.d/{{ item }}
   become: true
   when: ansible_os_family == 'RedHat' and ansible_distribution_major_version == "7"
   with_items:
@@ -51,10 +52,10 @@
 
 - name: disable unwanted repos
   shell: yum-config-manager --disable "{{ item }}"
-  with_items: "{{repolist.stdout_lines|difference(yumenablerepo)}}"
+  with_items: "{{ repolist.stdout_lines|difference(yumenablerepo) }}"
   become: true
   become_user: root
-  ignore_errors: true
+  ignore_errors: false
 
 
 #- name: Enable epel

roles/config_repos/files/epel.repo → roles/config_repos/templates/epel.repo.j2

@@ -2,7 +2,7 @@
 
 [epel]
 name=Extra Packages for Enterprise Linux 7 - $basearch
-baseurl=https://consistency0/epel/$releasever/$basearch/
+baseurl=https://{{ reposervername }}/epel/$releasever/$basearch/
 enabled=0
 gpgcheck=0
 sslverify=false

roles/config_repos/files/monashhpc_base.repo → roles/config_repos/templates/monashhpc_base.repo.j2

@@ -2,24 +2,24 @@
 
 [monashhpc_base]
 name=MonashHPC base repository mirrored to control the update process
-baseurl=https://consistency0/centos/$releasever/os/$basearch/
+baseurl=https://{{ reposervername }}/centos/$releasever/os/$basearch/
 enabled=1
 sslverify=false
 
 [monashhpc_updates]
 name=MonashHPC base repository mirrored to control the update process
-baseurl=https://consistency0/centos/$releasever/updates/$basearch/
+baseurl=https://{{ reposervername }}/centos/$releasever/updates/$basearch/
 enabled=1
 sslverify=false
 
 [monashhpc_extras]
 name=MonashHPC base repository mirrored to control the update process
-baseurl=https://consistency0/centos/$releasever/extras/$basearch/
+baseurl=https://{{ reposervername }}/centos/$releasever/extras/$basearch/
 enabled=1
 sslverify=false
 
 [monashhpc_centosplus]
 name=MonashHPC base repository mirrored to control the update process
-baseurl=https://consistency0/centos/$releasever/centosplus/$basearch/
+baseurl=https://{{ reposervername }}/centos/$releasever/centosplus/$basearch/
 enabled=1
 sslverify=false

roles/config_repos/files/monashhpc_others.repo → roles/config_repos/templates/monashhpc_others.repo.j2

@@ -2,7 +2,7 @@
 
 [monashhpc_otherstuff]
 name=MonashHPC base repository mirrored to control the update process
-baseurl=https://consistency0/centos/hpcsystems/$releasever/$basearch/
+baseurl=https://{{ reposervername }}/centos/hpcsystems/$releasever/$basearch/
 enabled=1
 sslverify=false
 gpgcheck=0

roles/extra_packages/tasks/main.yml

@@ -14,13 +14,20 @@
   when: ansible_os_family == 'RedHat'
  
 - name: "Install extra packages"
-  yum: "name={{ item }} exclude={{ excludes|join(',') }} update_cache=yes state=present"
+  yum: "name={{ item }}  update_cache=yes state=present enablerepo=epel" # exclude={{ excludes|join(',') }}
   with_items: "{{ extra_packages }}"
   become: true
   become_user: root
   when: ansible_os_family == 'RedHat'
   register: result
 
+- name: "Install extra packages from epel only"
+  yum: "name={{ item }}  update_cache=yes state=present enablerepo=epel" # exclude={{ excludes|join(',') }}
+  with_items: "{{ extra_packages_epel }}"
+  become: true
+  become_user: root
+  when: ansible_os_family == 'RedHat'
+
 - name: "Show yum install output"
   debug: 
     msg: "{{ result.results }}"