diff options
| -rw-r--r-- | controller.yaml | 6 | ||||
| -rw-r--r-- | deprecated/overcloud-source.yaml | 5 | ||||
| -rw-r--r-- | overcloud-without-mergepy.yaml | 4 | ||||
| -rw-r--r-- | puppet/controller-puppet.yaml | 6 |
4 files changed, 18 insertions, 3 deletions
diff --git a/controller.yaml b/controller.yaml index 52efa31b..2dcfb50e 100644 --- a/controller.yaml +++ b/controller.yaml @@ -133,6 +133,9 @@ parameters: type: string default: '' hidden: true + HeatAuthEncryptionKey: + description: Auth encryption key for heat-engine + type: string Image: type: string default: overcloud-control @@ -461,7 +464,7 @@ resources: admin_password: {get_input: heat_password} admin_tenant_name: service admin_user: heat - auth_encryption_key: unset___________ + auth_encryption_key: {get_input: heat_auth_encryption_key} db: {get_input: heat_dsn} debug: {get_input: debug} stack_domain_admin_password: {get_input: heat_stack_domain_admin_password} @@ -694,6 +697,7 @@ resources: - '/glance' heat_password: {get_param: HeatPassword} heat_stack_domain_admin_password: {get_param: HeatStackDomainAdminPassword} + heat_auth_encryption_key: {get_param: HeatAuthEncryptionKey} heat_dsn: list_join: - '' diff --git a/deprecated/overcloud-source.yaml b/deprecated/overcloud-source.yaml index 91b6b7fd..82fe6755 100644 --- a/deprecated/overcloud-source.yaml +++ b/deprecated/overcloud-source.yaml @@ -475,6 +475,8 @@ resources: SubKey: resources.NovaCompute0PassthroughSpecific parameters: passthrough_config_specific: {get_param: NovaComputeExtraConfig} + HeatAuthEncryptionKey: + type: OS::Heat::RandomString controllerConfig: type: OS::Heat::StructuredConfig properties: @@ -561,7 +563,8 @@ resources: get_param: HeatPassword admin_tenant_name: service admin_user: heat - auth_encryption_key: unset___________ + auth_encryption_key: + get_resource: HeatAuthEncryptionKey db: Fn::Join: - '' diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index 10e83363..c54248d5 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -500,6 +500,9 @@ parameters: resources: + HeatAuthEncryptionKey: + type: OS::Heat::RandomString + Controller: type: OS::Heat::ResourceGroup properties: @@ -527,6 +530,7 @@ resources: GlanceLogFile: {get_param: GlanceLogFile} HeatPassword: {get_param: HeatPassword} HeatStackDomainAdminPassword: {get_param: HeatStackDomainAdminPassword} + HeatAuthEncryptionKey: {get_resource: HeatAuthEncryptionKey} Image: {get_param: controllerImage} ImageUpdatePolicy: {get_param: ImageUpdatePolicy} KeyName: {get_param: KeyName} diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml index 798596fc..76e5483a 100644 --- a/puppet/controller-puppet.yaml +++ b/puppet/controller-puppet.yaml @@ -133,6 +133,9 @@ parameters: type: string default: '' hidden: true + HeatAuthEncryptionKey: + description: Auth encryption key for heat-engine + type: string Image: type: string default: overcloud-control @@ -437,6 +440,7 @@ resources: - - 'http://' - {get_param: VirtualIP} - ':8000/v1/waitcondition' + heat_auth_encryption_key: {get_param: HeatAuthEncryptionKey} admin_password: {get_param: AdminPassword} admin_token: {get_param: AdminToken} neutron_public_interface_ip: {get_param: NeutronPublicInterfaceIP} @@ -642,7 +646,7 @@ resources: heat::engine::heat_watch_server_url: {get_input: heat.watch_server_url} heat::engine::heat_metadata_server_url: {get_input: heat.metadata_server_url} heat::engine::heat_waitcondition_server_url: {get_input: heat.waitcondition_server_url} - heat::engine::auth_encryption_key: unset___________ + heat::engine::auth_encryption_key: {get_input: heat_auth_encryption_key} heat::rabbit_userid: {get_input: rabbit_username} heat::rabbit_password: {get_input: rabbit_password} heat::rabbit_host: {get_input: controller_virtual_ip} |