Move remnants of environments/services-docker
Move new files, which made it into environments/services-docker.
Ensure YAML validate will not pass for environments/services-docker
any more.
Change-Id: If16cf6bdafa8e10480134d356a7d7787f1c0bd72
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
(cherry picked from commit 4053399860
)
This commit is contained in:
parent
cc6e877708
commit
ed22431c8d
|
@ -0,0 +1,19 @@
|
||||||
|
# A Heat environment file that can be used to deploy Neutron LBaaSv2 service
|
||||||
|
#
|
||||||
|
# Currently there are only two interface drivers for Neutron LBaaSv2
|
||||||
|
# The default option is the standard OVS driver the other option is to be used
|
||||||
|
# when linux bridges are used instead of OVS
|
||||||
|
# In order to enable other backend, replace the content of NeutronLbaasInterfaceDriver
|
||||||
|
#
|
||||||
|
# - OVS: neutron.agent.linux.interface.OVSInterfaceDriver
|
||||||
|
# - LinuxBridges: neutron.agent.linux.interface.BridgeInterfaceDriver
|
||||||
|
resource_registry:
|
||||||
|
OS::TripleO::Services::NeutronLbaasv2Agent: ../../puppet/services/neutron-lbaas-agent.yaml
|
||||||
|
OS::TripleO::Services::NeutronLbaasv2Api: ../../puppet/services/neutron-lbaas-api.yaml
|
||||||
|
|
||||||
|
parameter_defaults:
|
||||||
|
NeutronLbaasInterfaceDriver: "neutron.agent.linux.interface.OVSInterfaceDriver"
|
||||||
|
NeutronLbaasDeviceDriver: "neutron_lbaas.drivers.haproxy.namespace_driver.HaproxyNSDriver"
|
||||||
|
NeutronServiceProviders: ['LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default']
|
||||||
|
NeutronServicePlugins: "qos,router,trunk,lbaasv2"
|
||||||
|
NeutronLbaasOvsUseVeth: false
|
|
@ -1,7 +0,0 @@
|
||||||
# A Heat environment file that can be used to deploy Neutron LBaaSv2 service
|
|
||||||
resource_registry:
|
|
||||||
OS::TripleO::Services::NeutronLbaasv2Api: ../../docker/services/neutron-lbaas-api.yaml
|
|
||||||
|
|
||||||
parameter_defaults:
|
|
||||||
NeutronServiceProviders: ['LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default']
|
|
||||||
NeutronServicePlugins: "qos,router,trunk,lbaasv2"
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
# A Heat environment file which can be used to enable
|
||||||
|
# Barbican with the default secret store backend.
|
||||||
|
resource_registry:
|
||||||
|
OS::TripleO::Services::Novajoin: ../../docker/services/novajoin.yaml
|
|
@ -0,0 +1,2 @@
|
||||||
|
resource_registry:
|
||||||
|
OS::TripleO::Services::Tempest: ../../docker/services/tempest.yaml
|
|
@ -879,8 +879,15 @@ for base_path in path_args:
|
||||||
if '.tox' in dirs:
|
if '.tox' in dirs:
|
||||||
dirs.remove('.tox')
|
dirs.remove('.tox')
|
||||||
for f in files:
|
for f in files:
|
||||||
|
file_path = os.path.join(subdir, f)
|
||||||
|
if 'environments/services-docker' in file_path:
|
||||||
|
print("ERROR: environments/services-docker should not be used "
|
||||||
|
"any more, use environments/services instead: %s " %
|
||||||
|
file_path)
|
||||||
|
failed_files.append(file_path)
|
||||||
|
exit_val |= 1
|
||||||
|
|
||||||
if f.endswith('.yaml') and not f.endswith('.j2.yaml'):
|
if f.endswith('.yaml') and not f.endswith('.j2.yaml'):
|
||||||
file_path = os.path.join(subdir, f)
|
|
||||||
failed = validate(file_path, param_map)
|
failed = validate(file_path, param_map)
|
||||||
if failed:
|
if failed:
|
||||||
failed_files.append(file_path)
|
failed_files.append(file_path)
|
||||||
|
|
Loading…
Reference in New Issue