diff options
Diffstat (limited to 'mcp/config/states')
| -rwxr-xr-x | mcp/config/states/openstack_noha | 6 | ||||
| -rwxr-xr-x | mcp/config/states/virtual_init | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha index f79d9f657..cb6059d9e 100755 --- a/mcp/config/states/openstack_noha +++ b/mcp/config/states/openstack_noha @@ -46,6 +46,12 @@ salt -I 'nova:compute' state.sls nova,armband salt -I 'barbican:server' state.sls barbican salt -I 'barbican:client' state.sls barbican +# remove config files coming from packages +for service in gnocchi panko; do + salt -I "${service}:server" pkg.install ${service}-api + salt -I "${service}:server" file.remove "/etc/apache2/sites-enabled/${service}-api.conf" +done + salt -I 'redis:server' state.sls redis salt -I 'gnocchi:server' state.sls gnocchi salt -I 'panko:server' state.sls panko diff --git a/mcp/config/states/virtual_init b/mcp/config/states/virtual_init index 77f4f5494..b5bb18955 100755 --- a/mcp/config/states/virtual_init +++ b/mcp/config/states/virtual_init @@ -36,8 +36,8 @@ if [[ "${base_image}" =~ centos ]]; then EXCLUDE_IDS="exclude='[{id: linux_kernel_net.core.netdev_budget_usecs}]'" fi wait_for 3.0 "salt -C 'E@^(${NODE_MASK}).*' state.sls linux ${EXCLUDE_IDS}" +wait_for 3.0 "salt -C 'E@^(${NODE_MASK}).*' pkg.upgrade refresh=False dist_upgrade=True" salt -C "E@^(${NODE_MASK}).*" cmd.run 'reboot' wait_for 90.0 "salt -C 'E@^(${NODE_MASK}).*' test.ping" -wait_for 3.0 "salt -C 'E@^(${NODE_MASK}).*' pkg.upgrade refresh=False dist_upgrade=True" wait_for 3.0 "salt -C 'E@^(${NODE_MASK}).*' state.apply salt,ntp" |