From c3759f82c0c0351e8e21cd69b1d1993dbd2b18fd Mon Sep 17 00:00:00 2001 From: "Fuel@OPNFV" Date: Sun, 15 Nov 2015 19:24:50 +0100 Subject: [PATCH] Distributed plug-in configuration templates This change proposes a new handling of plugin configuration files: - Each plugin is responsible to carry own configuration template files - Each of the plugin build fragments are responsible to copy these configuration files to ..deploy/templates/plugins/. - Later, some entity will be responsible to link rellevant configuration files from ..deploy/templates/plugins to ../conf/plugins_conf, I.e. to respective/active deployment environment. - The actual linking process is not in place yet, but it could for example be deploy.sh, a separate deploy prep script or similar performing the linking based on arguments, or a config file describing the wanted set-up. Change-Id: Ia16a2c26bb1e1a51195be2382da502777d209a45 Signed-off-by: jonas.bjurel@ericsson.com --- fuel/build/f_isoroot/f_odlpluginbuild/Makefile | 2 +- .../config/opendaylight_config.yaml} | 0 .../ericsson_montreal_lab/plugins_conf/.gitkeep | 0 .../plugins_conf/opendaylight.yaml | 52 ---------------------- .../pod1/plugins_conf/.gitkeep | 0 .../pod1/plugins_conf/opendaylight.yaml | 52 ---------------------- .../pod2/plugins_conf/.gitkeep | 0 .../conf/opnfv_box/plugins_conf/.gitkeep | 0 .../conf/opnfv_box/plugins_conf/opendaylight.yaml | 52 ---------------------- fuel/deploy/templates/plugins/.gitkeep | 0 .../virtual_environment/conf/plugins_conf/.gitkeep | 0 .../conf/plugins_conf/opendaylight.yaml | 52 ---------------------- 12 files changed, 1 insertion(+), 209 deletions(-) rename fuel/{deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/plugins_conf/opendaylight.yaml => build/f_isoroot/f_odlpluginbuild/config/opendaylight_config.yaml} (100%) create mode 100644 fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/plugins_conf/.gitkeep delete mode 100644 fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/plugins_conf/opendaylight.yaml create mode 100644 fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/plugins_conf/.gitkeep delete mode 100644 fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/plugins_conf/opendaylight.yaml create mode 100644 fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/plugins_conf/.gitkeep create mode 100644 fuel/deploy/templates/hardware_environment/conf/opnfv_box/plugins_conf/.gitkeep delete mode 100644 fuel/deploy/templates/hardware_environment/conf/opnfv_box/plugins_conf/opendaylight.yaml create mode 100644 fuel/deploy/templates/plugins/.gitkeep create mode 100644 fuel/deploy/templates/virtual_environment/conf/plugins_conf/.gitkeep delete mode 100644 fuel/deploy/templates/virtual_environment/conf/plugins_conf/opendaylight.yaml diff --git a/fuel/build/f_isoroot/f_odlpluginbuild/Makefile b/fuel/build/f_isoroot/f_odlpluginbuild/Makefile index df75fc695..a63cdadf8 100644 --- a/fuel/build/f_isoroot/f_odlpluginbuild/Makefile +++ b/fuel/build/f_isoroot/f_odlpluginbuild/Makefile @@ -25,7 +25,7 @@ release:.odlbuild @mkdir -p ../release/opnfv @cp opendaylight*.rpm ../release/opnfv/ cp gitinfo_odlplugin.txt $(BUILD_BASE) - + cd $(BUILD_BASE) && mkdir -p ../deploy/templates/plugins && cp -rf $(TOP)/config/* ../deploy/templates/plugins .odlbuild: rm -rf fuel-plugin-opendaylight sudo apt-get -y install build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev diff --git a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/plugins_conf/opendaylight.yaml b/fuel/build/f_isoroot/f_odlpluginbuild/config/opendaylight_config.yaml similarity index 100% rename from fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/plugins_conf/opendaylight.yaml rename to fuel/build/f_isoroot/f_odlpluginbuild/config/opendaylight_config.yaml diff --git a/fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/plugins_conf/.gitkeep b/fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/plugins_conf/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/plugins_conf/opendaylight.yaml b/fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/plugins_conf/opendaylight.yaml deleted file mode 100644 index 1944814a6..000000000 --- a/fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/plugins_conf/opendaylight.yaml +++ /dev/null @@ -1,52 +0,0 @@ -opendaylight: - metadata: - enabled: true - label: OpenDaylight plugin - plugin_id: 1 - restrictions: - - cluster:net_provider != 'neutron': Only neutron is supported by OpenDaylight - toggleable: true - weight: 70 - rest_api_port: - description: Port on which ODL REST API will be available. - label: Port number - regex: - error: Invalid port number - source: ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$ - type: text - value: '8282' - weight: 40 - use_vxlan: - description: Configure neutron to use VXLAN tunneling - label: Use vxlan - restrictions: - - action: disable - condition: networking_parameters:segmentation_type == 'vlan' - message: Neutron with GRE segmentation required - type: checkbox - value: true - weight: 20 - vni_range_end: - description: VXLAN VNI IDs range end - label: VNI range end - regex: - error: Invalid ID number - source: ^\d+$ - restrictions: - - action: hide - condition: networking_parameters:segmentation_type == 'vlan' - type: text - value: '10000' - weight: 31 - vni_range_start: - description: VXLAN VNI IDs range start - label: VNI range start - regex: - error: Invalid ID number - source: ^\d+$ - restrictions: - - action: hide - condition: networking_parameters:segmentation_type == 'vlan' - type: text - value: '10' - weight: 30 \ No newline at end of file diff --git a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/plugins_conf/.gitkeep b/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/plugins_conf/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/plugins_conf/opendaylight.yaml b/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/plugins_conf/opendaylight.yaml deleted file mode 100644 index 1944814a6..000000000 --- a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/plugins_conf/opendaylight.yaml +++ /dev/null @@ -1,52 +0,0 @@ -opendaylight: - metadata: - enabled: true - label: OpenDaylight plugin - plugin_id: 1 - restrictions: - - cluster:net_provider != 'neutron': Only neutron is supported by OpenDaylight - toggleable: true - weight: 70 - rest_api_port: - description: Port on which ODL REST API will be available. - label: Port number - regex: - error: Invalid port number - source: ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$ - type: text - value: '8282' - weight: 40 - use_vxlan: - description: Configure neutron to use VXLAN tunneling - label: Use vxlan - restrictions: - - action: disable - condition: networking_parameters:segmentation_type == 'vlan' - message: Neutron with GRE segmentation required - type: checkbox - value: true - weight: 20 - vni_range_end: - description: VXLAN VNI IDs range end - label: VNI range end - regex: - error: Invalid ID number - source: ^\d+$ - restrictions: - - action: hide - condition: networking_parameters:segmentation_type == 'vlan' - type: text - value: '10000' - weight: 31 - vni_range_start: - description: VXLAN VNI IDs range start - label: VNI range start - regex: - error: Invalid ID number - source: ^\d+$ - restrictions: - - action: hide - condition: networking_parameters:segmentation_type == 'vlan' - type: text - value: '10' - weight: 30 \ No newline at end of file diff --git a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/plugins_conf/.gitkeep b/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/plugins_conf/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/fuel/deploy/templates/hardware_environment/conf/opnfv_box/plugins_conf/.gitkeep b/fuel/deploy/templates/hardware_environment/conf/opnfv_box/plugins_conf/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/fuel/deploy/templates/hardware_environment/conf/opnfv_box/plugins_conf/opendaylight.yaml b/fuel/deploy/templates/hardware_environment/conf/opnfv_box/plugins_conf/opendaylight.yaml deleted file mode 100644 index 183ef9ca9..000000000 --- a/fuel/deploy/templates/hardware_environment/conf/opnfv_box/plugins_conf/opendaylight.yaml +++ /dev/null @@ -1,52 +0,0 @@ -opendaylight: - metadata: - enabled: true - label: OpenDaylight plugin - plugin_id: 1 - restrictions: - - cluster:net_provider != 'neutron': Only neutron is supported by OpenDaylight - toggleable: true - weight: 70 - rest_api_port: - description: Port on which ODL REST API will be available. - label: Port number - regex: - error: Invalid port number - source: ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$ - type: text - value: '8282' - weight: 40 - use_vxlan: - description: Configure neutron to use VXLAN tunneling - label: Use vxlan - restrictions: - - action: disable - condition: networking_parameters:segmentation_type == 'vlan' - message: Neutron with GRE segmentation required - type: checkbox - value: true - weight: 20 - vni_range_end: - description: VXLAN VNI IDs range end - label: VNI range end - regex: - error: Invalid ID number - source: ^\d+$ - restrictions: - - action: hide - condition: networking_parameters:segmentation_type == 'vlan' - type: text - value: '10000' - weight: 31 - vni_range_start: - description: VXLAN VNI IDs range start - label: VNI range start - regex: - error: Invalid ID number - source: ^\d+$ - restrictions: - - action: hide - condition: networking_parameters:segmentation_type == 'vlan' - type: text - value: '10' - weight: 30 diff --git a/fuel/deploy/templates/plugins/.gitkeep b/fuel/deploy/templates/plugins/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/fuel/deploy/templates/virtual_environment/conf/plugins_conf/.gitkeep b/fuel/deploy/templates/virtual_environment/conf/plugins_conf/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/fuel/deploy/templates/virtual_environment/conf/plugins_conf/opendaylight.yaml b/fuel/deploy/templates/virtual_environment/conf/plugins_conf/opendaylight.yaml deleted file mode 100644 index 183ef9ca9..000000000 --- a/fuel/deploy/templates/virtual_environment/conf/plugins_conf/opendaylight.yaml +++ /dev/null @@ -1,52 +0,0 @@ -opendaylight: - metadata: - enabled: true - label: OpenDaylight plugin - plugin_id: 1 - restrictions: - - cluster:net_provider != 'neutron': Only neutron is supported by OpenDaylight - toggleable: true - weight: 70 - rest_api_port: - description: Port on which ODL REST API will be available. - label: Port number - regex: - error: Invalid port number - source: ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$ - type: text - value: '8282' - weight: 40 - use_vxlan: - description: Configure neutron to use VXLAN tunneling - label: Use vxlan - restrictions: - - action: disable - condition: networking_parameters:segmentation_type == 'vlan' - message: Neutron with GRE segmentation required - type: checkbox - value: true - weight: 20 - vni_range_end: - description: VXLAN VNI IDs range end - label: VNI range end - regex: - error: Invalid ID number - source: ^\d+$ - restrictions: - - action: hide - condition: networking_parameters:segmentation_type == 'vlan' - type: text - value: '10000' - weight: 31 - vni_range_start: - description: VXLAN VNI IDs range start - label: VNI range start - regex: - error: Invalid ID number - source: ^\d+$ - restrictions: - - action: hide - condition: networking_parameters:segmentation_type == 'vlan' - type: text - value: '10' - weight: 30 -- 2.16.6