diff options
| -rw-r--r-- | environments/network-environment.yaml | 2 | ||||
| -rw-r--r-- | puppet/services/glance-api.yaml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/environments/network-environment.yaml b/environments/network-environment.yaml index 005310c7..9f2c667b 100644 --- a/environments/network-environment.yaml +++ b/environments/network-environment.yaml @@ -22,7 +22,7 @@ parameter_defaults: TenantNetCidr: 172.16.0.0/24 ExternalNetCidr: 10.0.0.0/24 # CIDR subnet mask length for provisioning network - ControlPlaneSubnetCidr: 24 + ControlPlaneSubnetCidr: '24' # Customize the IP ranges on each network to use for static IPs and VIPs InternalApiAllocationPools: [{'start': '172.17.0.10', 'end': '172.17.0.200'}] StorageAllocationPools: [{'start': '172.18.0.10', 'end': '172.18.0.200'}] diff --git a/puppet/services/glance-api.yaml b/puppet/services/glance-api.yaml index a1ab1a20..3e8784b7 100644 --- a/puppet/services/glance-api.yaml +++ b/puppet/services/glance-api.yaml @@ -47,6 +47,10 @@ parameters: default: guest description: The username for RabbitMQ type: string + RabbitClientPort: + default: 5672 + description: Set rabbit subscriber port, change this if using SSL + type: number RabbitClientUseSSL: default: false description: > @@ -87,6 +91,7 @@ outputs: glance_backend: {get_param: GlanceBackend} glance::db::mysql::password: {get_param: GlancePassword} glance::notify::rabbitmq::rabbit_userid: {get_param: RabbitUserName} + glance::notify::rabbitmq::rabbit_port: {get_param: RabbitClientPort} glance::notify::rabbitmq::rabbit_password: {get_param: RabbitPassword} glance::notify::rabbitmq::rabbit_use_ssl: {get_param: RabbitClientUseSSL} step_config: | |