openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix typo in standalone-tripleo environment"

Browse Source
This commit is contained in:
Zuul 2018-10-25 09:33:29 +00:00 committed by Gerrit Code Review
commit 5aa10d18ed
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
environments/standalone/standalone-overcloud.yaml
View File

@ -94,7 +94,7 @@ resource_registry:
OS::TripleO::Services::MistralEventEngine: OS::Heat::None
OS::TripleO::Services::MistralExecutor: OS::Heat::None
OS::TripleO::Services::PankoApi: OS::Heat::None
OS::TripleO::Services::SELinux: ../puppet/services/selinux.yaml
OS::TripleO::Services::SELinux: ../../puppet/services/selinux.yaml
OS::TripleO::Services::SaharaApi: OS::Heat::None
OS::TripleO::Services::SaharaEngine: OS::Heat::None
OS::TripleO::Services::Tacker: OS::Heat::None

2
environments/standalone/standalone-tripleo.yaml
View File

@ -102,7 +102,7 @@ resource_registry:
OS::TripleO::Services::MistralEventEngine: OS::Heat::None
OS::TripleO::Services::MistralExecutor: OS::Heat::None
OS::TripleO::Services::PankoApi: OS::Heat::None
OS::TripleO::Services::SELinux: ../puppet/services/selinux.yaml
OS::TripleO::Services::SELinux: ../../puppet/services/selinux.yaml
OS::TripleO::Services::SaharaApi: OS::Heat::None
OS::TripleO::Services::SaharaEngine: OS::Heat::None
OS::TripleO::Services::Tacker: OS::Heat::None

4
sample-env-generator/standalone.yaml
View File

@ -56,7 +56,7 @@ environments:
OS::TripleO::NodeExtraConfigPost: ../../extraconfig/post_deploy/standalone_post.yaml
# Manage SELinux
OS::TripleO::Services::SELinux: ../puppet/services/selinux.yaml
OS::TripleO::Services::SELinux: ../../puppet/services/selinux.yaml
# Disable non-openstack services that are enabled by default
OS::TripleO::Services::HAproxy: OS::Heat::None
@ -173,7 +173,7 @@ environments:
OS::TripleO::Standalone::Net::SoftwareConfig: ../../net-config-bridge.yaml
# Manage SELinux
OS::TripleO::Services::SELinux: ../puppet/services/selinux.yaml
OS::TripleO::Services::SELinux: ../../puppet/services/selinux.yaml
# Disable non-openstack services that are enabled by default
OS::TripleO::Services::Kubernetes::Master: OS::Heat::None