diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-09-04 11:35:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-09-04 11:35:14 +0000 |
| commit | 53bf694e12219c79853c5dfdc282769138524b2c (patch) | |
| tree | 62f202f5bafa0bc272d033ae8e58b4ac0a065f5a /mcp/config | |
| parent | 8eff52b0d776a278ca031feb35c0bb2bc0ebfebe (diff) | |
| parent | 607f89499eb76f113b97f5602c9c98cfbe74a28e (diff) | |
Merge "Turn off default apache ports" into stable/fraser
Diffstat (limited to 'mcp/config')
| -rwxr-xr-x | mcp/config/states/openstack_ha | 2 | ||||
| -rwxr-xr-x | mcp/config/states/openstack_noha | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha index 576a47e13..8cdd64baf 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -62,7 +62,7 @@ salt -I 'aodh:server' state.sls aodh -b 1 salt -I 'ceilometer:server' state.sls ceilometer salt -I 'ceilometer:agent' state.sls ceilometer -salt -I 'horizon:server' state.sls horizon +salt -I 'horizon:server' state.sls apache,horizon salt -I 'nginx:server' state.sls nginx cluster_public_host=$(salt -C 'I@nginx:server and *01*' --out=yaml \ diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha index 0fffd7a55..4d716e6a7 100755 --- a/mcp/config/states/openstack_noha +++ b/mcp/config/states/openstack_noha @@ -51,4 +51,4 @@ salt -I 'aodh:server' state.sls aodh salt -I 'ceilometer:server' state.sls ceilometer salt -I 'ceilometer:agent' state.sls ceilometer -salt -I 'horizon:server' state.sls horizon +salt -I 'horizon:server' state.sls apache,horizon |