From ed22431c8d77aa4c0f8aef7a87b1fc98ddd547bd Mon Sep 17 00:00:00 2001 From: Bogdan Dobrelya Date: Fri, 20 Apr 2018 09:49:37 +0200 Subject: [PATCH] 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 (cherry picked from commit 405339986060e4c851d846fdb7d5be05f43fd75e) --- .../services-baremetal/neutron-lbaasv2.yaml | 19 +++++++++++++++++++ .../services-docker/neutron-lbaasv2.yaml | 7 ------- environments/services/novajoin.yaml | 4 ++++ environments/services/tempest.yaml | 2 ++ .../update-odl.yaml | 0 tools/yaml-validate.py | 9 ++++++++- 6 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 environments/services-baremetal/neutron-lbaasv2.yaml delete mode 100644 environments/services-docker/neutron-lbaasv2.yaml create mode 100644 environments/services/novajoin.yaml create mode 100644 environments/services/tempest.yaml rename environments/{services-docker => services}/update-odl.yaml (100%) diff --git a/environments/services-baremetal/neutron-lbaasv2.yaml b/environments/services-baremetal/neutron-lbaasv2.yaml new file mode 100644 index 0000000000..8d32d1b0f1 --- /dev/null +++ b/environments/services-baremetal/neutron-lbaasv2.yaml @@ -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 diff --git a/environments/services-docker/neutron-lbaasv2.yaml b/environments/services-docker/neutron-lbaasv2.yaml deleted file mode 100644 index dc6bf69745..0000000000 --- a/environments/services-docker/neutron-lbaasv2.yaml +++ /dev/null @@ -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" diff --git a/environments/services/novajoin.yaml b/environments/services/novajoin.yaml new file mode 100644 index 0000000000..2a4056edba --- /dev/null +++ b/environments/services/novajoin.yaml @@ -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 diff --git a/environments/services/tempest.yaml b/environments/services/tempest.yaml new file mode 100644 index 0000000000..7e1efbe99f --- /dev/null +++ b/environments/services/tempest.yaml @@ -0,0 +1,2 @@ +resource_registry: + OS::TripleO::Services::Tempest: ../../docker/services/tempest.yaml diff --git a/environments/services-docker/update-odl.yaml b/environments/services/update-odl.yaml similarity index 100% rename from environments/services-docker/update-odl.yaml rename to environments/services/update-odl.yaml diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py index 9dcff8b4c9..eb12e30dac 100755 --- a/tools/yaml-validate.py +++ b/tools/yaml-validate.py @@ -879,8 +879,15 @@ for base_path in path_args: if '.tox' in dirs: dirs.remove('.tox') 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'): - file_path = os.path.join(subdir, f) failed = validate(file_path, param_map) if failed: failed_files.append(file_path)