Skip to content

Commit fccab71

Browse files
authored
updated docs and fixed things (#684)
* updated docs and fixed things * Update main.yml
1 parent 9a49875 commit fccab71

File tree

5 files changed

+10
-49
lines changed

5 files changed

+10
-49
lines changed

ansible/playbooks/setup-kubernetes.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

ansible/roles/host_setup/tasks/main.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,3 +121,12 @@
121121
until: install_packages is success
122122
retries: 5
123123
delay: 2
124+
125+
# this is added to remove conflicts with systemd-timesyncd and ntpsec with kubespray installation
126+
- name: Ensure conflicting time synchronization packages are removed
127+
package:
128+
name:
129+
- ntpsec
130+
- systemd-timesyncd
131+
state: absent
132+
purge: yes

base-kustomize/mariadb-cluster/base/mariadb-replication.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ spec:
4646
storageClassName: general
4747

4848
replicas: 3
49-
podSecurityContext:
50-
runAsUser: 0
5149

5250
replication:
5351
enabled: true

docs/k8s-kubespray.md

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -108,24 +108,7 @@ ansible-playbook host-setup.yml
108108

109109
``` shell
110110
cd /opt/genestack/submodules/kubespray
111-
ansible-playbook --inventory /etc/genestack/inventory/openstack-flex-inventory.ini \
112-
--private-key /home/ubuntu/.ssh/openstack-flex-keypair.key \
113-
--user ubuntu \
114-
--become \
115-
cluster.yml
116-
```
117-
118-
=== "Setup-Kubernetes Playbook _(Experimental)_"
119-
120-
The `private-key` option can be used to instruct ansible to use a custom SSH key for the SSH connection
121-
122-
``` shell
123-
--private-key ${HOME}/.ssh/openstack-keypair.key
124-
```
125-
126-
``` shell
127-
source /opt/genestack/scripts/genestack.rc
128-
ansible-playbook setup-kubernetes.yml
111+
ansible-playbook cluster.yml
129112
```
130113

131114
!!! tip

docs/k8s-labels.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ Make sure you label things accordingly.
1717
| <div style="width:220px">key</div> | type | <div style="width:128px">value</div> | notes |
1818
|:-----|--|:----------------:|:------|
1919
| **role** | str | `storage-node` | The "role" is general purpose, and currently only used when deploying the ceph cluster with rook |
20-
| **vault-storage** | str | `enabled` | Defines which nodes to deploy vault on |
2120
| **openstack-control-plane** | str| `enabled` | Defines which nodes will run the OpenStack Control Plane |
2221
| **openstack-compute-node** | str|`enabled` | Defines which nodes will run OpenStack Compute |
2322
| **openstack-network-node** | str|`enabled` | Defines which nodes will run OpenStack Networking |
@@ -32,9 +31,6 @@ Make sure you label things accordingly.
3231
# Label the storage nodes - optional and only used when deploying ceph for K8S infrastructure shared storage
3332
kubectl label node $(kubectl get nodes | awk '/ceph/ {print $1}') role=storage-node
3433

35-
# Label the HashiCorp Vault nodes
36-
kubectl label node $(kubectl get nodes | awk '/controller/ {print $1}' |head -3) vault-storage=enabled
37-
3834
# Label the openstack controllers
3935
kubectl label node $(kubectl get nodes | awk '/controller/ {print $1}') openstack-control-plane=enabled
4036

0 commit comments

Comments
 (0)