Remove kube-user.yaml
Since the fedora atomic already gets set up with the user "fedora", we can get rid of the "minion" user since it does not add any value and it is somewhat confusing logging into master nodes as "minion". Change-Id: I8c842d08780a786a1568f2d50219e580334ef487 Closes-bug: #1608923
This commit is contained in:
Drago Rosson
parent
35bec1887c
commit
83d154607e
|
|
@ -441,7 +441,7 @@ redis-master is running::
|
|||
The output here indicates the redis-master is running on the bay host with IP
|
||||
address 172.24.4.5. To access the redis master::
|
||||
|
||||
ssh minion@172.24.4.5
|
||||
ssh fedora@172.24.4.5
|
||||
REDIS_ID=$(sudo docker ps | grep redis:v1 | grep k8s_master | awk '{print $1}')
|
||||
sudo docker exec -i -t $REDIS_ID redis-cli
|
||||
|
||||
|
|
@ -455,7 +455,7 @@ Log into one of the other container hosts and access a redis slave from it.
|
|||
You can use `nova list` to enumerate the kube-minions. For this example we
|
||||
will use the same host as above::
|
||||
|
||||
ssh minion@172.24.4.5
|
||||
ssh fedora@172.24.4.5
|
||||
REDIS_ID=$(sudo docker ps | grep redis:v1 | grep k8s_redis | awk '{print $1}')
|
||||
sudo docker exec -i -t $REDIS_ID redis-cli
|
||||
|
||||
|
|
|
|||
|
|
@ -818,7 +818,7 @@ What runs on the servers
|
|||
and flannel run as systemd services.
|
||||
|
||||
Log into the servers
|
||||
You can log into the master servers using the login 'minion' and the
|
||||
You can log into the master servers using the login 'fedora' and the
|
||||
keypair specified in the baymodel.
|
||||
|
||||
External load balancer for services
|
||||
|
|
@ -2049,7 +2049,7 @@ The following software are managed as Docker containers:
|
|||
- kube-scheduler
|
||||
- kube-proxy
|
||||
|
||||
The login for this image is *minion*.
|
||||
The login for this image is *fedora*.
|
||||
|
||||
Kubernetes on CoreOS
|
||||
--------------------
|
||||
|
|
|
|||
|
|
@ -75,9 +75,9 @@ output-show` command:
|
|||
$ heat output-show my-kube-cluster kube_masters
|
||||
"192.168.200.86"
|
||||
|
||||
You can ssh into that server as the `minion` user:
|
||||
You can ssh into that server as the `fedora` user:
|
||||
|
||||
$ ssh minion@192.168.200.86
|
||||
$ ssh fedora@192.168.200.86
|
||||
|
||||
And once logged in you can run `kubectl`, etc:
|
||||
|
||||
|
|
@ -85,7 +85,7 @@ And once logged in you can run `kubectl`, etc:
|
|||
NAME LABELS STATUS
|
||||
10.0.0.4 <none> Ready
|
||||
|
||||
You can log into your minions using the `minion` user as well. You
|
||||
You can log into your minions using the `fedora` user as well. You
|
||||
can get a list of minion addresses by running:
|
||||
|
||||
$ heat output-show my-kube-cluster kube_minions
|
||||
|
|
|
|||
|
|
@ -75,9 +75,9 @@ output-show` command:
|
|||
$ heat output-show my-kube-cluster kube_masters
|
||||
"192.168.200.86"
|
||||
|
||||
You can ssh into that server as the `minion` user:
|
||||
You can ssh into that server as the `fedora` user:
|
||||
|
||||
$ ssh minion@192.168.200.86
|
||||
$ ssh fedora@192.168.200.86
|
||||
|
||||
And once logged in you can run `kubectl`, etc:
|
||||
|
||||
|
|
@ -85,7 +85,7 @@ And once logged in you can run `kubectl`, etc:
|
|||
NAME LABELS STATUS
|
||||
10.0.0.4 <none> Ready
|
||||
|
||||
You can log into your minions using the `minion` user as well. You
|
||||
You can log into your minions using the `fedora` user as well. You
|
||||
can get a list of minion addresses by running:
|
||||
|
||||
$ heat output-show my-kube-cluster kube_minions
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
#cloud-config
|
||||
system_info:
|
||||
default_user:
|
||||
name: minion
|
||||
lock_passwd: true
|
||||
gecos: Kubernetes Interactive User
|
||||
groups: [wheel, adm, systemd-journal]
|
||||
sudo: ["ALL=(ALL) NOPASSWD:ALL"]
|
||||
shell: /bin/bash
|
||||
|
|
@ -307,12 +307,6 @@ resources:
|
|||
group: ungrouped
|
||||
config: {get_file: fragments/enable-services-master.sh}
|
||||
|
||||
kube_user:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
properties:
|
||||
group: ungrouped
|
||||
config: {get_file: fragments/kube-user.yaml}
|
||||
|
||||
kube_examples:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
properties:
|
||||
|
|
@ -374,7 +368,6 @@ resources:
|
|||
- config: {get_resource: disable_selinux}
|
||||
- config: {get_resource: write_heat_params}
|
||||
- config: {get_resource: configure_etcd}
|
||||
- config: {get_resource: kube_user}
|
||||
- config: {get_resource: write_kube_os_config}
|
||||
- config: {get_resource: make_cert}
|
||||
- config: {get_resource: configure_docker_storage}
|
||||
|
|
|
|||
|
|
@ -79,12 +79,6 @@ resources:
|
|||
group: ungrouped
|
||||
config: {get_file: fragments/configure-kubernetes-minion.sh}
|
||||
|
||||
kube_user:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
properties:
|
||||
group: ungrouped
|
||||
config: {get_file: fragments/kube-user.yaml}
|
||||
|
||||
kube_examples:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
properties:
|
||||
|
|
@ -127,7 +121,6 @@ resources:
|
|||
parts:
|
||||
- config: {get_resource: disable_selinux}
|
||||
- config: {get_resource: write_heat_params}
|
||||
- config: {get_resource: kube_user}
|
||||
- config: {get_resource: kube_examples}
|
||||
- config: {get_resource: configure_kubernetes_minion}
|
||||
- config: {get_resource: docker_service}
|
||||
|
|
|
|||
|
|
@ -290,12 +290,6 @@ resources:
|
|||
group: ungrouped
|
||||
config: {get_file: fragments/configure-kubernetes-minion.sh}
|
||||
|
||||
kube_user:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
properties:
|
||||
group: ungrouped
|
||||
config: {get_file: fragments/kube-user.yaml}
|
||||
|
||||
kube_examples:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
properties:
|
||||
|
|
@ -356,7 +350,6 @@ resources:
|
|||
parts:
|
||||
- config: {get_resource: disable_selinux}
|
||||
- config: {get_resource: write_heat_params}
|
||||
- config: {get_resource: kube_user}
|
||||
- config: {get_resource: write_kubeconfig}
|
||||
- config: {get_resource: make_cert}
|
||||
- config: {get_resource: kube_examples}
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ function remote_exec {
|
|||
mkdir -p $LOG_PATH
|
||||
|
||||
if [[ "$COE" == "kubernetes" ]]; then
|
||||
SSH_USER=minion
|
||||
SSH_USER=fedora
|
||||
remote_exec $SSH_USER "sudo systemctl --full list-units --no-pager" systemctl_list_units.log
|
||||
remote_exec $SSH_USER "sudo journalctl -u cloud-config --no-pager" cloud-config.log
|
||||
remote_exec $SSH_USER "sudo journalctl -u cloud-final --no-pager" cloud-final.log
|
||||
|
|
|
|||
Loading…
Reference in New Issue