From 44fce1ea2b2e79708516f1dd67a677aea1e65a67 Mon Sep 17 00:00:00 2001 From: John Lockman Date: Tue, 7 Jul 2020 09:58:08 -0500 Subject: [PATCH] removed all instances of `master` from scripts and playbooks Signed-off-by: John Lockman --- CONTRIBUTING.md | 4 ++-- docs/INSTALL.md | 6 +++--- docs/PREINSTALL.md | 4 ++-- docs/README.md | 2 +- examples/README.md | 2 +- kubernetes/host_inventory_file | 6 +++--- kubernetes/jupyterhub.yaml | 2 +- kubernetes/kubeflow.yaml | 2 +- kubernetes/kubernetes.yml | 14 +++++++------- .../roles/{master => manager}/files/k8s.conf | 0 .../{master => manager}/files/kubernetes.repo | 0 .../roles/{master => manager}/files/nvidia | 0 .../roles/{master => manager}/tasks/main.yml | 10 +++++----- .../files/create_admin_user.yaml | 0 .../files/create_clusterRoleBinding.yaml | 0 .../files/data-pv.yaml | 0 .../files/data2-pv.yaml | 0 .../files/data3-pv.yaml | 0 .../files/data4-pv.yaml | 0 .../files/enable_gpu_k8s.sh | 0 .../files/flannel_net.sh | 0 .../files/katib-pv.yaml | 0 .../files/kube-flannel.yaml | 0 .../files/kubeflow_persistent_volumes.yaml | 0 .../files/minio-pvc.yaml | 0 .../files/mysql-pv.yaml | 0 .../files/nfs-class.yaml | 0 .../files/nfs-deployment.yaml | 0 .../files/nfs-serviceaccount.yaml | 0 .../files/nfs_clusterrole.yaml | 0 .../files/nfs_clusterrolebinding.yaml | 0 .../files/notebook-pv.yaml | 0 .../files/persistent_volumes.yaml | 0 .../files/pvc.yaml | 0 .../files/tiller_config.sh | 0 .../tasks/main.yml | 18 +++++++++--------- kubernetes/roles/startworkers/tasks/main.yml | 2 +- .../tasks/main.yaml | 6 +++--- slurm/slurm.yml | 6 +++--- slurm/slurm_inventory_file | 6 +++--- tools/install_tools.yml | 2 +- 41 files changed, 46 insertions(+), 46 deletions(-) rename kubernetes/roles/{master => manager}/files/k8s.conf (100%) rename kubernetes/roles/{master => manager}/files/kubernetes.repo (100%) rename kubernetes/roles/{master => manager}/files/nvidia (100%) rename kubernetes/roles/{master => manager}/tasks/main.yml (93%) rename kubernetes/roles/{startmaster => startmanager}/files/create_admin_user.yaml (100%) rename kubernetes/roles/{startmaster => startmanager}/files/create_clusterRoleBinding.yaml (100%) rename kubernetes/roles/{startmaster => startmanager}/files/data-pv.yaml (100%) rename kubernetes/roles/{startmaster => startmanager}/files/data2-pv.yaml (100%) rename kubernetes/roles/{startmaster => startmanager}/files/data3-pv.yaml (100%) rename kubernetes/roles/{startmaster => startmanager}/files/data4-pv.yaml (100%) rename kubernetes/roles/{startmaster => startmanager}/files/enable_gpu_k8s.sh (100%) rename kubernetes/roles/{startmaster => startmanager}/files/flannel_net.sh (100%) rename kubernetes/roles/{startmaster => startmanager}/files/katib-pv.yaml (100%) rename kubernetes/roles/{startmaster => startmanager}/files/kube-flannel.yaml (100%) rename kubernetes/roles/{startmaster => startmanager}/files/kubeflow_persistent_volumes.yaml (100%) rename kubernetes/roles/{startmaster => startmanager}/files/minio-pvc.yaml (100%) rename kubernetes/roles/{startmaster => startmanager}/files/mysql-pv.yaml (100%) rename kubernetes/roles/{startmaster => startmanager}/files/nfs-class.yaml (100%) rename kubernetes/roles/{startmaster => startmanager}/files/nfs-deployment.yaml (100%) rename kubernetes/roles/{startmaster => startmanager}/files/nfs-serviceaccount.yaml (100%) rename kubernetes/roles/{startmaster => startmanager}/files/nfs_clusterrole.yaml (100%) rename kubernetes/roles/{startmaster => startmanager}/files/nfs_clusterrolebinding.yaml (100%) rename kubernetes/roles/{startmaster => startmanager}/files/notebook-pv.yaml (100%) rename kubernetes/roles/{startmaster => startmanager}/files/persistent_volumes.yaml (100%) rename kubernetes/roles/{startmaster => startmanager}/files/pvc.yaml (100%) rename kubernetes/roles/{startmaster => startmanager}/files/tiller_config.sh (100%) rename kubernetes/roles/{startmaster => startmanager}/tasks/main.yml (89%) rename slurm/roles/{slurm-master => slurm-manager}/tasks/main.yaml (96%) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 71c86f47f..c0c1df7fb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -32,7 +32,7 @@ Contributions to Omnia are made through [Pull Requests (PRs)](https://help.githu 6. **Create a pull request:** [Create a pull request](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request) with a title following this format Issue ###: Description (_i.e., Issue 1023: Reformat testutils_). It is important that you do a good job with the description to make the job of the code reviewer easier. A good description not only reduces review time, but also reduces the probability of a misunderstanding with the pull request. * **Important:** When preparing a pull request it is important to stay up-to-date with the project repository. We recommend that you rebase against the upstream repo _frequently_. To do this, use the following commands: ``` - git pull --rebase upstream master #upstream is dellhpc/omnia + git pull --rebase upstream devel #upstream is dellhpc/omnia git push --force origin #origin is your fork of the repository (e.g., /omnia.git) ``` * **PR Description:** Be sure to fully describe the pull request. Ideally, your PR description will contain: @@ -42,7 +42,7 @@ Contributions to Omnia are made through [Pull Requests (PRs)](https://help.githu 4. How to verify that the changes work correctly. ## Omnia Branches and Contribution Flow -The diagram below describes the contribution flow. Omnia has two lifetime branches: `devel` and `master`. The `master` branch is reserved for releases and their associated tags. The `devel` branch is where all development work occurs. The `devel` branch is also the default branch for the project. +The diagram below describes the contribution flow. Omnia has two lifetime branches: `devel` and `release`. The `release` branch is reserved for releases and their associated tags. The `devel` branch is where all development work occurs. The `devel` branch is also the default branch for the project. ![Omnia Branch Flowchart](docs/images/omnia-branch-structure.png "Flowchart of Omnia branches") diff --git a/docs/INSTALL.md b/docs/INSTALL.md index 9c6a4f482..0b0cd5fd6 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -63,7 +63,7 @@ Omnia playbooks perform several tasks: - Docker - Kubelet -`master` playbook +`manager` playbook * Install Helm v3 * (optional) add firewall rules for Slurm and kubernetes @@ -72,10 +72,10 @@ Everything from this point on can be called by using the `init` tag ansible-playbook -i host_inventory_file kubernetes/kubernetes.yml --tags "init" ``` -`startmaster` playbook +`startmanager` playbook * turn off swap *Initialize Kubernetes - * Head/master + * Head/manager - Start K8S pass startup token to compute/slaves - Initialize software defined networking (Calico) diff --git a/docs/PREINSTALL.md b/docs/PREINSTALL.md index b8b609bef..1af4b90ff 100644 --- a/docs/PREINSTALL.md +++ b/docs/PREINSTALL.md @@ -5,7 +5,7 @@ Omnia assumes that prior to installation: * Systems have a base operating system (currently CentOS 7 or 8) * Network(s) has been cabled and nodes can reach the internet * SSH Keys for `root` have been installed on all nodes to allow for password-less SSH -* Ansible is installed on either the master node or a separate deployment node +* Ansible is installed on either the manager node or a separate deployment node ``` yum install ansible ``` @@ -22,6 +22,6 @@ Omnia assumes that servers are already connected to the network and have access ### Network Topology Possible network configurations include: * A flat topology where all nodes are connected to a switch which includes an uplink to the internet. This requires multiple externally-facing IP addresses -* A hierarchical topology where compute nodes are connected to a common switch, but the master node contains a second network connection which is connected to the internet. All outbound/inbound traffic would be routed through the master node. This requires setting up firewall rules for IP masquerade, see [here](https://www.server-world.info/en/note?os=CentOS_7&p=firewalld&f=2) for an example. +* A hierarchical topology where compute nodes are connected to a common switch, but the manager node contains a second network connection which is connected to the internet. All outbound/inbound traffic would be routed through the manager node. This requires setting up firewall rules for IP masquerade, see [here](https://www.server-world.info/en/note?os=CentOS_7&p=firewalld&f=2) for an example. ### IP and Hostname Assignment The recommended setup is to assign IP addresses to individual servers. This can be done manually by logging onto each node, or via DHCP. diff --git a/docs/README.md b/docs/README.md index fc24b2282..0d685c90b 100644 --- a/docs/README.md +++ b/docs/README.md @@ -38,6 +38,6 @@ It's not just new features and bug fixes that can be contributed to the Omnia pr * Feedback * Validation that it works for your particular configuration -If you would like to contribute, see [CONTRIBUTING](https://github.com/dellhpc/omnia/blob/master/CONTRIBUTING.md). +If you would like to contribute, see [CONTRIBUTING](https://github.com/dellhpc/omnia/blob/devel/CONTRIBUTING.md). ### [Omnia Contributors](CONTRIBUTORS.md) diff --git a/examples/README.md b/examples/README.md index 258cfe466..6f507a5d2 100644 --- a/examples/README.md +++ b/examples/README.md @@ -1,7 +1,7 @@ # Examples -The examples [K8s Submit](https://github.com/dellhpc/omnia/blob/master/examples/k8s-TensorFlow-resnet50-multinode-MPIOperator.yaml) and [SLURM submit](https://github.com/dellhpc/omnia/blob/master/examples/slurm-TensorFlow-resnet50-multinode-MPI.batch) are provide as examples for running the resnet50 benchmark with TensorFlow on 8 GPUs using 2 C4140s. +The examples [K8s Submit](https://github.com/dellhpc/omnia/blob/devel/examples/k8s-TensorFlow-resnet50-multinode-MPIOperator.yaml) and [SLURM submit](https://github.com/dellhpc/omnia/blob/devel/examples/slurm-TensorFlow-resnet50-multinode-MPI.batch) are provide as examples for running the resnet50 benchmark with TensorFlow on 8 GPUs using 2 C4140s. ## Submitting the example diff --git a/kubernetes/host_inventory_file b/kubernetes/host_inventory_file index 607fe3e2f..15097ca11 100644 --- a/kubernetes/host_inventory_file +++ b/kubernetes/host_inventory_file @@ -2,7 +2,7 @@ all: children: cluster: children: - master: + manager: hosts: compute000: workers: @@ -14,7 +14,7 @@ all: hosts: compute002: compute004: - compute005: + #compute005: vars: single_node: false - master_ip: 10.0.0.100 + manager_ip: 10.0.0.100 diff --git a/kubernetes/jupyterhub.yaml b/kubernetes/jupyterhub.yaml index 161bf20cc..33c45bdfe 100644 --- a/kubernetes/jupyterhub.yaml +++ b/kubernetes/jupyterhub.yaml @@ -16,7 +16,7 @@ #Playbook for installing JupyterHub v1.1.0 in Omnia # Start K8s worker servers -- hosts: master +- hosts: manager gather_facts: false roles: - jupyterhub diff --git a/kubernetes/kubeflow.yaml b/kubernetes/kubeflow.yaml index abda4bc1d..4e0900483 100644 --- a/kubernetes/kubeflow.yaml +++ b/kubernetes/kubeflow.yaml @@ -16,7 +16,7 @@ #Playbook for installing Kubeflow v1.0 on Omnia # Start K8s worker servers -- hosts: master +- hosts: manager gather_facts: false roles: - kubeflow diff --git a/kubernetes/kubernetes.yml b/kubernetes/kubernetes.yml index 8814c2ff9..0ffe6840e 100644 --- a/kubernetes/kubernetes.yml +++ b/kubernetes/kubernetes.yml @@ -30,17 +30,17 @@ roles: - computeGPU -# Apply Master Config -- hosts: master +# Apply Manager Config +- hosts: manager gather_facts: false roles: - - master + - manager -# Start K8s on master server -- hosts: master +# Start K8s on manager server +- hosts: manager gather_facts: false roles: - - startmaster + - startmanager # Start K8s worker servers - hosts: compute,gpus @@ -49,7 +49,7 @@ - startworkers # Start K8s worker servers -- hosts: master +- hosts: manager gather_facts: false roles: - startservices diff --git a/kubernetes/roles/master/files/k8s.conf b/kubernetes/roles/manager/files/k8s.conf similarity index 100% rename from kubernetes/roles/master/files/k8s.conf rename to kubernetes/roles/manager/files/k8s.conf diff --git a/kubernetes/roles/master/files/kubernetes.repo b/kubernetes/roles/manager/files/kubernetes.repo similarity index 100% rename from kubernetes/roles/master/files/kubernetes.repo rename to kubernetes/roles/manager/files/kubernetes.repo diff --git a/kubernetes/roles/master/files/nvidia b/kubernetes/roles/manager/files/nvidia similarity index 100% rename from kubernetes/roles/master/files/nvidia rename to kubernetes/roles/manager/files/nvidia diff --git a/kubernetes/roles/master/tasks/main.yml b/kubernetes/roles/manager/tasks/main.yml similarity index 93% rename from kubernetes/roles/master/tasks/main.yml rename to kubernetes/roles/manager/tasks/main.yml index 9d461c0f8..dafd524b9 100644 --- a/kubernetes/roles/master/tasks/main.yml +++ b/kubernetes/roles/manager/tasks/main.yml @@ -15,15 +15,15 @@ --- #- name: Firewall Rule K8s:6443/tcp #command: firewall-cmd --zone=internal --add-port=6443/tcp --permanent - #tags: master + #tags: manager # #- name: Firewall Rule K8s:10250/tcp #command: firewall-cmd --zone=internal --add-port=10250/tcp --permanent - #tags: master + #tags: manater ## #- name: Firewall Reload #command: firewall-cmd --reload - #tags: master + #tags: manager # - name: Create /root/bin (if it doesn't exist) file: @@ -36,10 +36,10 @@ url: https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 dest: /root/bin/get_helm.sh mode: 700 - tags: master + tags: manager - name: Install Helm command: /root/bin/get_helm.sh - tags: master + tags: manager # install and start up OpenSM - III diff --git a/kubernetes/roles/startmaster/files/create_admin_user.yaml b/kubernetes/roles/startmanager/files/create_admin_user.yaml similarity index 100% rename from kubernetes/roles/startmaster/files/create_admin_user.yaml rename to kubernetes/roles/startmanager/files/create_admin_user.yaml diff --git a/kubernetes/roles/startmaster/files/create_clusterRoleBinding.yaml b/kubernetes/roles/startmanager/files/create_clusterRoleBinding.yaml similarity index 100% rename from kubernetes/roles/startmaster/files/create_clusterRoleBinding.yaml rename to kubernetes/roles/startmanager/files/create_clusterRoleBinding.yaml diff --git a/kubernetes/roles/startmaster/files/data-pv.yaml b/kubernetes/roles/startmanager/files/data-pv.yaml similarity index 100% rename from kubernetes/roles/startmaster/files/data-pv.yaml rename to kubernetes/roles/startmanager/files/data-pv.yaml diff --git a/kubernetes/roles/startmaster/files/data2-pv.yaml b/kubernetes/roles/startmanager/files/data2-pv.yaml similarity index 100% rename from kubernetes/roles/startmaster/files/data2-pv.yaml rename to kubernetes/roles/startmanager/files/data2-pv.yaml diff --git a/kubernetes/roles/startmaster/files/data3-pv.yaml b/kubernetes/roles/startmanager/files/data3-pv.yaml similarity index 100% rename from kubernetes/roles/startmaster/files/data3-pv.yaml rename to kubernetes/roles/startmanager/files/data3-pv.yaml diff --git a/kubernetes/roles/startmaster/files/data4-pv.yaml b/kubernetes/roles/startmanager/files/data4-pv.yaml similarity index 100% rename from kubernetes/roles/startmaster/files/data4-pv.yaml rename to kubernetes/roles/startmanager/files/data4-pv.yaml diff --git a/kubernetes/roles/startmaster/files/enable_gpu_k8s.sh b/kubernetes/roles/startmanager/files/enable_gpu_k8s.sh similarity index 100% rename from kubernetes/roles/startmaster/files/enable_gpu_k8s.sh rename to kubernetes/roles/startmanager/files/enable_gpu_k8s.sh diff --git a/kubernetes/roles/startmaster/files/flannel_net.sh b/kubernetes/roles/startmanager/files/flannel_net.sh similarity index 100% rename from kubernetes/roles/startmaster/files/flannel_net.sh rename to kubernetes/roles/startmanager/files/flannel_net.sh diff --git a/kubernetes/roles/startmaster/files/katib-pv.yaml b/kubernetes/roles/startmanager/files/katib-pv.yaml similarity index 100% rename from kubernetes/roles/startmaster/files/katib-pv.yaml rename to kubernetes/roles/startmanager/files/katib-pv.yaml diff --git a/kubernetes/roles/startmaster/files/kube-flannel.yaml b/kubernetes/roles/startmanager/files/kube-flannel.yaml similarity index 100% rename from kubernetes/roles/startmaster/files/kube-flannel.yaml rename to kubernetes/roles/startmanager/files/kube-flannel.yaml diff --git a/kubernetes/roles/startmaster/files/kubeflow_persistent_volumes.yaml b/kubernetes/roles/startmanager/files/kubeflow_persistent_volumes.yaml similarity index 100% rename from kubernetes/roles/startmaster/files/kubeflow_persistent_volumes.yaml rename to kubernetes/roles/startmanager/files/kubeflow_persistent_volumes.yaml diff --git a/kubernetes/roles/startmaster/files/minio-pvc.yaml b/kubernetes/roles/startmanager/files/minio-pvc.yaml similarity index 100% rename from kubernetes/roles/startmaster/files/minio-pvc.yaml rename to kubernetes/roles/startmanager/files/minio-pvc.yaml diff --git a/kubernetes/roles/startmaster/files/mysql-pv.yaml b/kubernetes/roles/startmanager/files/mysql-pv.yaml similarity index 100% rename from kubernetes/roles/startmaster/files/mysql-pv.yaml rename to kubernetes/roles/startmanager/files/mysql-pv.yaml diff --git a/kubernetes/roles/startmaster/files/nfs-class.yaml b/kubernetes/roles/startmanager/files/nfs-class.yaml similarity index 100% rename from kubernetes/roles/startmaster/files/nfs-class.yaml rename to kubernetes/roles/startmanager/files/nfs-class.yaml diff --git a/kubernetes/roles/startmaster/files/nfs-deployment.yaml b/kubernetes/roles/startmanager/files/nfs-deployment.yaml similarity index 100% rename from kubernetes/roles/startmaster/files/nfs-deployment.yaml rename to kubernetes/roles/startmanager/files/nfs-deployment.yaml diff --git a/kubernetes/roles/startmaster/files/nfs-serviceaccount.yaml b/kubernetes/roles/startmanager/files/nfs-serviceaccount.yaml similarity index 100% rename from kubernetes/roles/startmaster/files/nfs-serviceaccount.yaml rename to kubernetes/roles/startmanager/files/nfs-serviceaccount.yaml diff --git a/kubernetes/roles/startmaster/files/nfs_clusterrole.yaml b/kubernetes/roles/startmanager/files/nfs_clusterrole.yaml similarity index 100% rename from kubernetes/roles/startmaster/files/nfs_clusterrole.yaml rename to kubernetes/roles/startmanager/files/nfs_clusterrole.yaml diff --git a/kubernetes/roles/startmaster/files/nfs_clusterrolebinding.yaml b/kubernetes/roles/startmanager/files/nfs_clusterrolebinding.yaml similarity index 100% rename from kubernetes/roles/startmaster/files/nfs_clusterrolebinding.yaml rename to kubernetes/roles/startmanager/files/nfs_clusterrolebinding.yaml diff --git a/kubernetes/roles/startmaster/files/notebook-pv.yaml b/kubernetes/roles/startmanager/files/notebook-pv.yaml similarity index 100% rename from kubernetes/roles/startmaster/files/notebook-pv.yaml rename to kubernetes/roles/startmanager/files/notebook-pv.yaml diff --git a/kubernetes/roles/startmaster/files/persistent_volumes.yaml b/kubernetes/roles/startmanager/files/persistent_volumes.yaml similarity index 100% rename from kubernetes/roles/startmaster/files/persistent_volumes.yaml rename to kubernetes/roles/startmanager/files/persistent_volumes.yaml diff --git a/kubernetes/roles/startmaster/files/pvc.yaml b/kubernetes/roles/startmanager/files/pvc.yaml similarity index 100% rename from kubernetes/roles/startmaster/files/pvc.yaml rename to kubernetes/roles/startmanager/files/pvc.yaml diff --git a/kubernetes/roles/startmaster/files/tiller_config.sh b/kubernetes/roles/startmanager/files/tiller_config.sh similarity index 100% rename from kubernetes/roles/startmaster/files/tiller_config.sh rename to kubernetes/roles/startmanager/files/tiller_config.sh diff --git a/kubernetes/roles/startmaster/tasks/main.yml b/kubernetes/roles/startmanager/tasks/main.yml similarity index 89% rename from kubernetes/roles/startmaster/tasks/main.yml rename to kubernetes/roles/startmanager/tasks/main.yml index 202108888..1440936d8 100644 --- a/kubernetes/roles/startmaster/tasks/main.yml +++ b/kubernetes/roles/startmanager/tasks/main.yml @@ -18,7 +18,7 @@ tags: init - name: Initialize kubeadm - command: /bin/kubeadm init --pod-network-cidr=10.244.0.0/16 --apiserver-advertise-address={{ master_ip }} + command: /bin/kubeadm init --pod-network-cidr=10.244.0.0/16 --apiserver-advertise-address={{ manager_ip }} #command: /bin/kubeadm init register: init_output tags: init @@ -44,30 +44,30 @@ - name: CA Hash shell: openssl x509 -pubkey -in /etc/kubernetes/pki/ca.crt | openssl rsa -pubin -outform der 2>/dev/null | openssl dgst -sha256 -hex | sed 's/^.* //' - register: K8S_MASTER_CA_HASH + register: K8S_MANAGER_CA_HASH tags: init -- name: Add K8S Master IP, Token, and Hash to dummy host +- name: Add K8S Manager IP, Token, and Hash to dummy host add_host: name: "K8S_TOKEN_HOLDER" token: "{{ K8S_TOKEN.stdout }}" - hash: "{{ K8S_MASTER_CA_HASH.stdout }}" - ip: "{{ master_ip }}" + hash: "{{ K8S_MANAGER_CA_HASH.stdout }}" + ip: "{{ manager_ip }}" tags: init - name: debug: - msg: "[Master] K8S_TOKEN_HOLDER K8S token is {{ hostvars['K8S_TOKEN_HOLDER']['token'] }}" + msg: "[Manager] K8S_TOKEN_HOLDER K8S token is {{ hostvars['K8S_TOKEN_HOLDER']['token'] }}" tags: init - name: debug: - msg: "[Master] K8S_TOKEN_HOLDER K8S Hash is {{ hostvars['K8S_TOKEN_HOLDER']['hash'] }}" + msg: "[Manager] K8S_TOKEN_HOLDER K8S Hash is {{ hostvars['K8S_TOKEN_HOLDER']['hash'] }}" tags: init - name: debug: - msg: "[Master] K8S_MASTER_IP is {{ master_ip }}" + msg: "[Manager] K8S_MANAGER_IP is {{ manager_ip }}" tags: init - name: Setup Calico SDN network @@ -115,7 +115,7 @@ shell: kubectl -n kube-system describe secret $(kubectl -n kube-system get secret | grep admin-user | awk '{print $1}') > /root/k8s/token tags: init -- name: Edge / Workstation Install allows pods to scheudle on master +- name: Edge / Workstation Install allows pods to scheudle on manager shell: kubectl taint nodes --all node-role.kubernetes.io/master- when: single_node tags: init diff --git a/kubernetes/roles/startworkers/tasks/main.yml b/kubernetes/roles/startworkers/tasks/main.yml index 41d15626c..85af1f850 100644 --- a/kubernetes/roles/startworkers/tasks/main.yml +++ b/kubernetes/roles/startworkers/tasks/main.yml @@ -30,7 +30,7 @@ #- name: #debug: - #msg: "[Worker] K8S_MASTER_IP is {{ hostvars['K8S_TOKEN_HOLDER']['ip'] }}" + #msg: "[Worker] K8S_MANGER_IP is {{ hostvars['K8S_TOKEN_HOLDER']['ip'] }}" #tags: init - name: "Kubeadmn join" diff --git a/slurm/roles/slurm-master/tasks/main.yaml b/slurm/roles/slurm-manager/tasks/main.yaml similarity index 96% rename from slurm/roles/slurm-master/tasks/main.yaml rename to slurm/roles/slurm-manager/tasks/main.yaml index 2f4af3d71..498a2da70 100644 --- a/slurm/roles/slurm-master/tasks/main.yaml +++ b/slurm/roles/slurm-manager/tasks/main.yaml @@ -33,7 +33,7 @@ - /root/rpmbuild/RPMS/x86_64/slurm*20*.rpm tags: install -- name: Install SLURM RPMs on Master +- name: Install SLURM RPMs on Manager yum: name: "{{ item }}" #name: "{{ query('fileglob', ['/home/rpms/slurm*20*.rpm']) }}" <-- how it should work to avoid loop @@ -96,14 +96,14 @@ command: sacctmgr -i add user root DefaultAccount=defaultgroup tags: install -- name: Start slurmctld on Master +- name: Start slurmctld on Manager service: name: slurmctld state: restarted enabled: yes tags: install -- name: Enable Slurmdbd on Master +- name: Enable Slurmdbd on Manager service: name: slurmdbd state: restarted diff --git a/slurm/slurm.yml b/slurm/slurm.yml index a0ad9456f..dca488a95 100644 --- a/slurm/slurm.yml +++ b/slurm/slurm.yml @@ -23,11 +23,11 @@ roles: - slurm-common -# Apply Master Config, start services -- hosts: master +# Apply Manager Config, start services +- hosts: manager gather_facts: false roles: - - slurm-master + - slurm-manager # Start SLURM workers - hosts: compute diff --git a/slurm/slurm_inventory_file b/slurm/slurm_inventory_file index 9edcee009..db6a10177 100644 --- a/slurm/slurm_inventory_file +++ b/slurm/slurm_inventory_file @@ -1,7 +1,7 @@ -[master] +[manager] friday -[master:vars] +[manager:vars] slurm_url=https://download.schedmd.com/slurm/slurm-20.02.0.tar.bz2 slurm_md5=md5:8ed2257471ff24ca213b510a4c1c3563 @@ -14,5 +14,5 @@ compute[002:005] compute [cluster:children] -master +manager workers diff --git a/tools/install_tools.yml b/tools/install_tools.yml index b8b81a7e7..6ea03ecf6 100644 --- a/tools/install_tools.yml +++ b/tools/install_tools.yml @@ -13,7 +13,7 @@ # limitations under the License. --- -- hosts: master +- hosts: manager tasks: - name: Install Change Personality Script copy: