Skip to content

Commit

Permalink
Change Docker-commands
Browse files Browse the repository at this point in the history
* Where possible replace grep and awk based commands
  to find container IDs with Docker-native solution.
  • Loading branch information
svenseeberg committed Sep 6, 2018
1 parent 2521a75 commit 84d6515
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions xml/admin_administration.xml
Expand Up @@ -138,7 +138,7 @@ caasp3-worker-4 Ready &lt;none&gt; 1d v1.9.8</screen>
<para>
Log in to the admin node and run:
</para>
<screen>&prompt.user;<command>docker exec -it $(docker ps | grep salt-master | awk '{print $1}') \
<screen>&prompt.user;<command>docker exec -it $(docker ps -q -f name=salt-master) \
salt -P 'roles:(admin|kube-master|kube-minion)' \
cmd.run "<replaceable>df -h</replaceable>"</command>
</screen>
Expand Down Expand Up @@ -521,14 +521,14 @@ entrypoint.sh bundle exec rails runner 'puts Minion.find_by(minion_id: "<replace
<para>
Gracefully shut down all worker nodes.
</para>
<screen>&prompt.root.admin;<command>docker exec -it $(docker ps | grep salt-master | awk '{print $1}') \
<screen>&prompt.root.admin;<command>docker exec -it $(docker ps -q -f name=salt-master) \
salt --async -G 'roles:kube-minion' cmd.run 'systemctl poweroff'</command></screen>
</step>
<step>
<para>
Gracefully shut down all master nodes.
</para>
<screen>&prompt.root.admin;<command>docker exec -it $(docker ps | grep salt-master | awk '{print $1}') \
<screen>&prompt.root.admin;<command>docker exec -it $(docker ps -q -f name=salt-master) \
salt --async -G 'roles:kube-master' cmd.run 'systemctl poweroff'</command></screen>
</step>
<step>
Expand Down
12 changes: 6 additions & 6 deletions xml/admin_logging.xml
Expand Up @@ -254,7 +254,7 @@
<para>
Retrieve the <literal>salt-master</literal> logs.
</para>
<screen>&prompt.user;<command>docker exec -it $(docker ps | grep salt-master | awk '{print $1}') \
<screen>&prompt.user;<command>docker exec -it $(docker ps -q -f name=salt-master) \
cat /var/log/salt/master</command>
</screen>
</sect2>
Expand All @@ -271,7 +271,7 @@ cat /var/log/salt/master</command>
by reading the <filename>/var/log/salt/minion</filename> file.
</para>
<screen>
&prompt.user;<command>docker exec -it $(docker ps | grep salt-master | awk '{print $1}') \
&prompt.user;<command>docker exec -it $(docker ps -q -f name=salt-master) \
salt '*' cmd.run "cat /var/log/salt/minion"</command>
</screen>
</sect2>
Expand Down Expand Up @@ -381,7 +381,7 @@ salt '*' cmd.run "cat /var/log/salt/minion"</command>
<literal>salt-master</literal> container, like:
</para>
<screen>
<command>docker rm -f $(docker ps | grep salt-master | awk '{print $1}')</command>.
<command>docker rm -f $(docker ps -q -f name=salt-master)</command>.
</screen>
<para>
After deleting this container, the <literal>kubelet</literal> will bring
Expand All @@ -390,7 +390,7 @@ salt '*' cmd.run "cat /var/log/salt/minion"</command>
<literal>debug</literal> loglevel.
</para>
<screen>
<command>docker logs -f $(docker ps | grep salt-master | awk '{print $1}')</command>
<command>docker logs -f $(docker ps -q -f name=salt-master)</command>
</screen>
</sect3>
</sect2>
Expand Down Expand Up @@ -424,7 +424,7 @@ salt '*' cmd.run "cat /var/log/salt/minion"</command>
</para>

<screen>
&prompt.user;<command>docker exec -it $(docker ps | grep salt-master | awk '{print $1}') \
&prompt.user;<command>docker exec -it $(docker ps -q -f name=salt-master) \
salt -P 'roles:(admin|kube-master|kube-minion)' \
cmd.run "journalctl -u transactional-update"</command>
</screen>
Expand Down Expand Up @@ -617,7 +617,7 @@ entrypoint.sh bundle exec rake "velum:create_pillar['kube_log_level', '5']"</com
Then run Salt orchestration to rebuild the configuration across the
cluster.
</para>
<screen>&prompt.user;<command>docker exec -it $(docker ps | grep salt-master | awk '{print $1}') \
<screen>&prompt.user;<command>docker exec -it $(docker ps -q -f name=salt-master) \
salt-run state.orchestrate orch.kubernetes</command>
</screen>
</step>
Expand Down
6 changes: 3 additions & 3 deletions xml/admin_software.xml
Expand Up @@ -389,7 +389,7 @@
</para>

<screen>
&prompt.user;<command>docker exec -i $(docker ps | grep salt-master | awk '{print $1}') \
&prompt.user;<command>docker exec -i $(docker ps -q -f name=salt-master) \
salt --batch 10 -P "roles:(admin|kube-(master|minion))" \
cmd.run "rpm -q SUSEConnect"</command>

Expand Down Expand Up @@ -438,7 +438,7 @@ retcode:
<literal>transactional-update.timer</literal>.
</para>
<screen>
&prompt.user;<command>docker exec -i $(docker ps | grep salt-master | awk '{print $1}') \
&prompt.user;<command>docker exec -i $(docker ps -q -f name=salt-master) \
salt --batch 10 -P "roles:(admin|kube-(master|minion))" \
cmd.run "systemctl disable --now transactional-update.timer"</command>

Expand Down Expand Up @@ -500,7 +500,7 @@ retcode:
</para>
</note>
<screen>
&prompt.user;<command>docker exec -i $(docker ps | grep salt-master | awk '{print $1}') \
&prompt.user;<command>docker exec -i $(docker ps -q -f name=salt-master) \
salt --batch <replaceable>10</replaceable> -P "roles:(admin|kube-(master|minion))" \
cmd.run "transactional-update salt migration -n" \
| tee transactional-update-migration.log</command>
Expand Down

0 comments on commit 84d6515

Please sign in to comment.