Merge pull request #59 from rug-cit-hpc/fix/remove-obsolete-files-#59

Did a cleanup. #59
rug-cit-hpc · Feb 19, 2019 · 6873464 · 6873464
2 parents bc48b18 + 9e46b63
commit 6873464
Show file tree

Hide file tree

Showing 27 changed files with 6 additions and 195 deletions.
diff --git a/cinder-controller.yml b/cinder-controller.yml
diff --git a/cinder-storage.yml b/cinder-storage.yml
diff --git a/cluster.yml b/cluster.yml
@@ -55,6 +55,12 @@
      - prom_server
      - cadvisor
      - slurm
+  vars:
+     # These variables are needed by the mariadb role.
+     # Which is a depencency of the slurm role.
+     # See roles/slurm/meta/main.yml
+     hostname_node0: "{{ ansible_hostname }}"
+     ip_node0: "{{ ansible_default_ipv4['address'] }}"
 
 - name: Install virtual compute nodes
   hosts: compute-vm

diff --git a/gearshift_hosts.ini b/gearshift_hosts.ini
@@ -1,43 +1,3 @@
-[databases]
-gs-openstack
-gs-compute10
-gs-compute11
-
-[keystone]
-gs-openstack
-
-[glance-controller]
-gs-openstack
-
-[heat]
-gs-openstack
-
-[horizon]
-gs-openstack
-
-[rabbitmq]
-gs-openstack
-gs-compute10
-gs-compute11
-
-[memcached]
-gs-openstack
-
-[neutron-controller]
-gs-openstack physical_interface_mappings=provider:enp130s0f0
-
-[nova-controller]
-gs-openstack
-
-[cinder-controller]
-gs-openstack
-
-[cinder-storage]
-gs-compute[01:11] storage_volume=/dev/sdb
-
-[nova-compute]
-gs-compute[01:11] physical_interface_mappings=provider:enp130s0f0
-
 [jumphost]
 airlock
 
@@ -68,7 +28,3 @@ administration
 [gearshift-cluster:children]
 cluster
 jumphost
-
-[metal]
-gs-openstack
-gs-compute[01:11]
diff --git a/glance-controller.yml b/glance-controller.yml
diff --git a/heat.yml b/heat.yml
diff --git a/horizon.yml b/horizon.yml
diff --git a/keystone.yml b/keystone.yml
diff --git a/mariadb.yml b/mariadb.yml
diff --git a/memcached.yml b/memcached.yml
diff --git a/neutron-controller.yml b/neutron-controller.yml
diff --git a/nova-compute.yml b/nova-compute.yml
diff --git a/nova-controller.yml b/nova-controller.yml
diff --git a/rabbitmq.yml b/rabbitmq.yml
diff --git a/requirements.yml b/requirements.yml
@@ -1,10 +1,4 @@
 ---
-# pull down common roles from the HPC cloud repo
-- src: ssh://git@git.webhosting.rug.nl:222/HPC/hpc-cloud.git
-  name: hpc-cloud
-  version: umcg-0.2
-  scm: git
-
 # Mostly user accounts of hpc playbooks.
 - src: ssh://git@git.webhosting.rug.nl:222/HPC/HPCplaybooks.git
   name: HPCplaybooks

diff --git a/settings.yml b/settings.yml
diff --git a/dai.yml → single_roles/dai.yml b/dai.yml → single_roles/dai.yml
diff --git a/figlet.yml → single_roles/figlet.yml b/figlet.yml → single_roles/figlet.yml
diff --git a/firewall.yml → single_roles/firewall.yml b/firewall.yml → single_roles/firewall.yml
diff --git a/monitoring.yml → single_roles/monitoring.yml b/monitoring.yml → single_roles/monitoring.yml
diff --git a/resolver.yml → single_roles/resolver.yml b/resolver.yml → single_roles/resolver.yml
diff --git a/rsyslog.yml → single_roles/rsyslog.yml b/rsyslog.yml → single_roles/rsyslog.yml
diff --git a/slurm-client.yml → single_roles/slurm-client.yml b/slurm-client.yml → single_roles/slurm-client.yml
diff --git a/slurm.yml → single_roles/slurm.yml b/slurm.yml → single_roles/slurm.yml
diff --git a/ssh_host_signer.yml → single_roles/ssh_host_signer.yml b/ssh_host_signer.yml → single_roles/ssh_host_signer.yml
diff --git a/site.yml b/site.yml
diff --git a/vnode.yml b/vnode.yml