Merge "puppet: install Horizon on overcloud-controller"
This commit is contained in:
commit
4e4c403760
@ -168,6 +168,9 @@ parameters:
|
|||||||
HeatAuthEncryptionKey:
|
HeatAuthEncryptionKey:
|
||||||
description: Auth encryption key for heat-engine
|
description: Auth encryption key for heat-engine
|
||||||
type: string
|
type: string
|
||||||
|
HorizonSecret:
|
||||||
|
description: Secret key for Django
|
||||||
|
type: string
|
||||||
Image:
|
Image:
|
||||||
type: string
|
type: string
|
||||||
default: overcloud-control
|
default: overcloud-control
|
||||||
|
@ -545,6 +545,11 @@ resources:
|
|||||||
properties:
|
properties:
|
||||||
length: 16
|
length: 16
|
||||||
|
|
||||||
|
HorizonSecret:
|
||||||
|
type: OS::Heat::RandomString
|
||||||
|
properties:
|
||||||
|
length: 10
|
||||||
|
|
||||||
Controller:
|
Controller:
|
||||||
type: OS::Heat::ResourceGroup
|
type: OS::Heat::ResourceGroup
|
||||||
properties:
|
properties:
|
||||||
@ -581,6 +586,7 @@ resources:
|
|||||||
HeatPassword: {get_param: HeatPassword}
|
HeatPassword: {get_param: HeatPassword}
|
||||||
HeatStackDomainAdminPassword: {get_param: HeatStackDomainAdminPassword}
|
HeatStackDomainAdminPassword: {get_param: HeatStackDomainAdminPassword}
|
||||||
HeatAuthEncryptionKey: {get_resource: HeatAuthEncryptionKey}
|
HeatAuthEncryptionKey: {get_resource: HeatAuthEncryptionKey}
|
||||||
|
HorizonSecret: {get_resource: HorizonSecret}
|
||||||
Image: {get_param: controllerImage}
|
Image: {get_param: controllerImage}
|
||||||
ImageUpdatePolicy: {get_param: ImageUpdatePolicy}
|
ImageUpdatePolicy: {get_param: ImageUpdatePolicy}
|
||||||
KeyName: {get_param: KeyName}
|
KeyName: {get_param: KeyName}
|
||||||
|
@ -66,6 +66,10 @@ resources:
|
|||||||
list_join:
|
list_join:
|
||||||
- ','
|
- ','
|
||||||
- {get_param: controller_ips}
|
- {get_param: controller_ips}
|
||||||
|
memcache_node_ips:
|
||||||
|
list_join:
|
||||||
|
- ','
|
||||||
|
- {get_param: controller_ips}
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
config_id:
|
config_id:
|
||||||
|
@ -168,6 +168,9 @@ parameters:
|
|||||||
HeatAuthEncryptionKey:
|
HeatAuthEncryptionKey:
|
||||||
description: Auth encryption key for heat-engine
|
description: Auth encryption key for heat-engine
|
||||||
type: string
|
type: string
|
||||||
|
HorizonSecret:
|
||||||
|
description: Secret key for Django
|
||||||
|
type: string
|
||||||
Image:
|
Image:
|
||||||
type: string
|
type: string
|
||||||
default: overcloud-control
|
default: overcloud-control
|
||||||
@ -484,6 +487,7 @@ resources:
|
|||||||
- {get_param: VirtualIP}
|
- {get_param: VirtualIP}
|
||||||
- ':8000/v1/waitcondition'
|
- ':8000/v1/waitcondition'
|
||||||
heat_auth_encryption_key: {get_param: HeatAuthEncryptionKey}
|
heat_auth_encryption_key: {get_param: HeatAuthEncryptionKey}
|
||||||
|
horizon_secret: {get_param: HorizonSecret}
|
||||||
admin_password: {get_param: AdminPassword}
|
admin_password: {get_param: AdminPassword}
|
||||||
admin_token: {get_param: AdminToken}
|
admin_token: {get_param: AdminToken}
|
||||||
neutron_public_interface_ip: {get_param: NeutronPublicInterfaceIP}
|
neutron_public_interface_ip: {get_param: NeutronPublicInterfaceIP}
|
||||||
@ -842,6 +846,12 @@ resources:
|
|||||||
nova::network::neutron::neutron_url: {get_input: neutron_url}
|
nova::network::neutron::neutron_url: {get_input: neutron_url}
|
||||||
nova::network::neutron::neutron_admin_auth_url: {get_input: neutron_admin_auth_url}
|
nova::network::neutron::neutron_admin_auth_url: {get_input: neutron_admin_auth_url}
|
||||||
|
|
||||||
|
# Horizon
|
||||||
|
horizon::django_debug: {get_input: debug}
|
||||||
|
horizon::secret_key: {get_input: horizon_secret}
|
||||||
|
horizon::bind_address: {get_input: controller_host}
|
||||||
|
horizon::keystone_url: {get_input: keystone_auth_uri}
|
||||||
|
|
||||||
# Rabbit
|
# Rabbit
|
||||||
rabbitmq::node_ip_address: {get_input: controller_host}
|
rabbitmq::node_ip_address: {get_input: controller_host}
|
||||||
rabbitmq::erlang_cookie: {get_input: rabbit_cookie}
|
rabbitmq::erlang_cookie: {get_input: rabbit_cookie}
|
||||||
|
@ -79,6 +79,9 @@ heat::engine::trusts_delegated_roles: []
|
|||||||
pacemaker::corosync::cluster_name: 'tripleo_cluster'
|
pacemaker::corosync::cluster_name: 'tripleo_cluster'
|
||||||
pacemaker::corosync::manage_fw: false
|
pacemaker::corosync::manage_fw: false
|
||||||
|
|
||||||
|
# horizon
|
||||||
|
horizon::allowed_hosts: '*'
|
||||||
|
|
||||||
mysql::server::manage_config_file: true
|
mysql::server::manage_config_file: true
|
||||||
|
|
||||||
tripleo::loadbalancer::keystone_admin: true
|
tripleo::loadbalancer::keystone_admin: true
|
||||||
|
@ -472,6 +472,13 @@ if hiera('step') >= 3 {
|
|||||||
include ::heat::api_cloudwatch
|
include ::heat::api_cloudwatch
|
||||||
include ::heat::engine
|
include ::heat::engine
|
||||||
|
|
||||||
|
# Horizon
|
||||||
|
$vhost_params = { add_listen => false }
|
||||||
|
class { 'horizon':
|
||||||
|
cache_server_ip => split(hiera('memcache_node_ips', '127.0.0.1'), ','),
|
||||||
|
vhost_extra_params => $vhost_params,
|
||||||
|
}
|
||||||
|
|
||||||
$snmpd_user = hiera('snmpd_readonly_user_name')
|
$snmpd_user = hiera('snmpd_readonly_user_name')
|
||||||
snmp::snmpv3_user { $snmpd_user:
|
snmp::snmpv3_user { $snmpd_user:
|
||||||
authtype => 'MD5',
|
authtype => 'MD5',
|
||||||
|
Loading…
Reference in New Issue
Block a user