Allow ssh from all for undercloud
I89cff59947dda3f51482486c41a3d67c4aa36a3e broke SSH access on the
Undercloud, we shouldn't be that restrictive by default for the
undercloud and standalone (as deployed via tripleo deploy).
This change adds a new parameter called SshFirewallAllowAll that can be
used to include an allow all for ssh. By default it is disabled when
deploying the overcloud but is used by the undercloud and standalone to
allow access after installation.
Change-Id: Ie548f7216610e15af24c96f65a58cc8de603235c
Co-Authored-By: Alex Schultz <aschultz@redhat.com>
Related-Bug: #1826829
(cherry picked from commit 2b7cb19876
)
This commit is contained in:
parent
123535d8c9
commit
cba7c22857
|
@ -44,6 +44,10 @@ parameter_defaults:
|
|||
# Type: string
|
||||
SoftwareConfigTransport: POLL_SERVER_HEAT
|
||||
|
||||
# Set this to true to open up ssh access from all sources.
|
||||
# Type: boolean
|
||||
SshFirewallAllowAll: True
|
||||
|
||||
# Heat action on performed top-level stack. Note StackUpdateType is set to UPGRADE when a major-version upgrade is in progress.
|
||||
# Mandatory. This parameter must be set by the user.
|
||||
# Type: string
|
||||
|
|
|
@ -200,3 +200,4 @@ parameter_defaults:
|
|||
tacker::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
|
||||
zaqar::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
|
||||
swift::objectexpirer::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
|
||||
SshFirewallAllowAll: true
|
||||
|
|
|
@ -65,6 +65,10 @@ parameters:
|
|||
default: 'no'
|
||||
description: Whether or not disable password authentication
|
||||
type: string
|
||||
SshFirewallAllowAll:
|
||||
default: false
|
||||
description: Set this to true to open up ssh access from all sources.
|
||||
type: boolean
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
|
@ -72,9 +76,18 @@ outputs:
|
|||
value:
|
||||
service_name: sshd
|
||||
config_settings:
|
||||
tripleo::profile::base::sshd::bannertext: {get_param: BannerText}
|
||||
tripleo::profile::base::sshd::motd: {get_param: MessageOfTheDay}
|
||||
tripleo::profile::base::sshd::options: {get_param: SshServerOptions}
|
||||
tripleo::profile::base::sshd::password_authentication: {get_param: PasswordAuthentication}
|
||||
map_merge:
|
||||
- tripleo::profile::base::sshd::bannertext: {get_param: BannerText}
|
||||
tripleo::profile::base::sshd::motd: {get_param: MessageOfTheDay}
|
||||
tripleo::profile::base::sshd::options: {get_param: SshServerOptions}
|
||||
tripleo::profile::base::sshd::password_authentication: {get_param: PasswordAuthentication}
|
||||
- if:
|
||||
- {get_param: SshFirewallAllowAll}
|
||||
- tripleo::sshd::firewall_rules:
|
||||
'003 accept ssh from all':
|
||||
proto: 'tcp'
|
||||
dport: 22
|
||||
- null
|
||||
|
||||
step_config: |
|
||||
include ::tripleo::profile::base::sshd
|
||||
|
|
|
@ -31,6 +31,9 @@ environments:
|
|||
puppet/services/tripleo-packages.yaml:
|
||||
parameters:
|
||||
- EnablePackageInstall
|
||||
puppet/services/sshd.yaml:
|
||||
parameters:
|
||||
- SshFirewallAllowAll
|
||||
# TODO(aschultz): hack to pull in this config transport, not sure it is
|
||||
# still neded.
|
||||
puppet/controller-role.yaml:
|
||||
|
@ -47,6 +50,8 @@ environments:
|
|||
StackAction: CREATE
|
||||
SoftwareConfigTransport: POLL_SERVER_HEAT
|
||||
EnablePackageInstall: true
|
||||
SwiftReplicas: 1
|
||||
SshFirewallAllowAll: true
|
||||
resource_registry:
|
||||
# this network config is assumed by the tripleo deploy command
|
||||
OS::TripleO::Network::Ports::RedisVipPort: ../../network/ports/noop.yaml
|
||||
|
|
Loading…
Reference in New Issue