QubesOS/qubes-installer-qubes-os
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qubes-anaconda-addon: adjust mgmt stack usage

Browse Source 
Salt-minion config is no longer generated using 'state.sls config', so
remove references to it. Instead make sure all modules are up to date in
cache (saltutil.sync_all).

Also make sure 'salt-minion' service is disabled (it is no longer
handled by config formula).

Additionally dom0 states are no longer in separate environment.

Slightly improve logging.
This commit is contained in:
Marek Marczykowski-Górecki 2016-06-06 00:51:38 +02:00
parent 7ff84cf133
commit 8b37d08376
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qubes-anaconda-addon/firstboot-qubes-text
View File

@ -91,7 +91,7 @@ done
set -e set -e
for service in rdisc kdump libvirt-guests; do for service in rdisc kdump libvirt-guests salt-minion; do
systemctl disable ${service}.service || : systemctl disable ${service}.service || :
systemctl stop ${service}.service || : systemctl stop ${service}.service || :
done done
@ -114,7 +114,7 @@ if [ "$vms_service" == "yes" -o "$vms_app" == "yes" ]; then
mv /var/log/salt/minion /var/log/salt/minion.install || : mv /var/log/salt/minion /var/log/salt/minion.install || :
fi fi
qubesctl state.sls config -l quiet --out quiet qubesctl saltutil.sync_all -l quiet --out quiet
fi fi
states=() states=()
@ -130,7 +130,7 @@ fi
if [ "$vms_service" == "yes" -o "$vms_app" == "yes" ]; then if [ "$vms_service" == "yes" -o "$vms_app" == "yes" ]; then
for state in "${states[@]}"; do for state in "${states[@]}"; do
echo "-> Requesting creation of VM: ${state#qvm.}" echo "-> Requesting creation of VM: ${state#qvm.}"
qubesctl top.enable "${state}" saltenv=dom0 -l quiet --out quiet qubesctl top.enable "${state}" -l quiet --out quiet
done done
echo "-> Creating VMs" echo "-> Creating VMs"

6
qubes-anaconda-addon/org_qubes_os_initial_setup/gui/spokes/qubes_os.py
View File

@ -484,7 +484,7 @@ class QubesOsSpoke(FirstbootOnlySpokeMixIn, NormalSpoke):
def configure_dom0(self): def configure_dom0(self):
self.set_stage("Setting up administration VM (dom0)") self.set_stage("Setting up administration VM (dom0)")
for service in [ 'rdisc', 'kdump', 'libvirt-guests' ]: for service in [ 'rdisc', 'kdump', 'libvirt-guests', 'salt-minion' ]:
self.run_command(['systemctl', 'disable', '{}.service'.format(service) ], ignore_failure=True) self.run_command(['systemctl', 'disable', '{}.service'.format(service) ], ignore_failure=True)
self.run_command(['systemctl', 'stop', '{}.service'.format(service) ], ignore_failure=True) self.run_command(['systemctl', 'stop', '{}.service'.format(service) ], ignore_failure=True)
@ -498,11 +498,11 @@ class QubesOsSpoke(FirstbootOnlySpokeMixIn, NormalSpoke):
pass pass
# Refresh minion configuration to make sure all installed formulas are included # Refresh minion configuration to make sure all installed formulas are included
self.run_command(['qubesctl', 'state.sls', 'config', '-l', 'quiet', '--out', 'quiet']) self.run_command(['qubesctl', 'saltutil.sync_all'])
for state in QubesChoice.get_states(): for state in QubesChoice.get_states():
print("Setting up state: {}".format(state)) print("Setting up state: {}".format(state))
self.run_command(['qubesctl', 'top.enable', state, 'saltenv=dom0', '-l', 'quiet', '--out', 'quiet']) self.run_command(['qubesctl', 'top.enable', state])
try: try:
self.run_command(['qubesctl', 'state.highstate']) self.run_command(['qubesctl', 'state.highstate'])