diff options
| -rw-r--r-- | build/Makefile | 2 | ||||
| -rw-r--r-- | build/f_isoroot/Makefile | 2 | ||||
| -rw-r--r-- | build/f_isoroot/f_congress-pluginbuild/Makefile | 91 | ||||
| -rw-r--r-- | build/f_isoroot/f_congress-pluginbuild/config.mk | 12 | ||||
| -rw-r--r-- | deploy/config/plugins/fuel-congress_1.0.0.yaml | 49 | ||||
| -rw-r--r-- | deploy/scenario/ha_heat_ceilometer_scenario.yaml | 5 | ||||
| -rw-r--r-- | deploy/scenario/no-ha_heat_ceilometer_scenario.yaml | 5 |
7 files changed, 162 insertions, 4 deletions
diff --git a/build/Makefile b/build/Makefile index d4b981a9d..6ce6dbd9c 100644 --- a/build/Makefile +++ b/build/Makefile @@ -184,7 +184,7 @@ deepclean: clean clean-cache docker rmi opnfv.org/ubuntu-builder:14.04 &>/dev/null || exit 0 docker rmi opnfv.org/ubuntu-builder:latest &>/dev/null || exit 0 docker rmi ubuntu:14.04 &>/dev/null || exit 0 - @if docker images | grep -q "ubuntu *14.04"; then \ + @if docker images | grep -q "^ubuntu *14.04"; then \ echo "Error: ubuntu:14.04 still present!"; \ exit 1; \ fi diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile index b7d159414..c21546ad3 100644 --- a/build/f_isoroot/Makefile +++ b/build/f_isoroot/Makefile @@ -11,7 +11,7 @@ # Add Fuel plugin build targets here # Plugins disabled for the Fuel Newton uplift. Please re-enable your plugin as you have # verified it! -PLUGINS ?= f_ovs-nsh-dpdk-pluginbuild f_vsperfpluginbuild f_kvm-pluginbuild f_yardstick-pluginbuild f_collectd-ceilometer-pluginbuild +PLUGINS ?= f_ovs-nsh-dpdk-pluginbuild f_vsperfpluginbuild f_kvm-pluginbuild f_yardstick-pluginbuild f_collectd-ceilometer-pluginbuild f_congress-pluginbuild export PLUGINS NON_10-0_REBASED_PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_bgpvpn-pluginbuild diff --git a/build/f_isoroot/f_congress-pluginbuild/Makefile b/build/f_isoroot/f_congress-pluginbuild/Makefile new file mode 100644 index 000000000..51167acd9 --- /dev/null +++ b/build/f_isoroot/f_congress-pluginbuild/Makefile @@ -0,0 +1,91 @@ +############################################################################## +# Copyright (c) 2016 Mirantis Inc and others. +# fzhadaev@mirantis.com +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +TOP := $(shell pwd) + +############################################################################ +# BEGIN of Include definitions +# +include config.mk +# +# END Include definitions +############################################################################# + + +.PHONY: all +all: .congressbuild + +.PHONY: clean +clean: + @rm -f .congressbuild ../release/opnfv/congress*.rpm congress*.rpm + @rm -f $(BUILD_BASE)/gitinfo_congressplugin.txt gitinfo_congressplugin.txt + +.PHONY: release +release:.congressbuild + @rm -f ../release/opnfv/congress*.rpm + @mkdir -p ../release/congress + @cp congress*.rpm ../release/opnfv/ + cp gitinfo_congressplugin.txt $(BUILD_BASE) + +.congressbuild: + rm -rf fuel-plugin-congress + git clone $(CONGRESS_REPO) + cd fuel-plugin-congress; \ + git checkout $(CONGRESS_BRANCH); \ + if [ ! -z $(CONGRESS_CHANGE) ]; then \ + git fetch $(CONGRESS_REPO) $(CONGRESS_CHANGE); \ + git checkout FETCH_HEAD; \ + fi + fpb --debug --build fuel-plugin-congress/ + @mv fuel-plugin-congress/congress*.rpm . + $(REPOINFO) -r . > gitinfo_congressplugin.txt + @rm -rf fuel-plugin-congress + @touch .congressbuild + # Store artifact in cache straight away if caching is enabled + # (no .cacheid will be present unless this is a cached build) + test -f .cacheid && $(MAKE) -f Makefile put-cache || exit 0 + +############################################################################# +# Cache operations - only used when building through ci/build.sh +############################################################################# + + +# Create a unique hash to be used for getting and putting cache, based on: +# - The SHA1 hash of the HEAD on the plugin repo's $(CONGRESS_BRANCH) +# - The contents of this Makefile +.cacheid: + @if [ ! -z $(CONGRESS_CHANGE) ]; then \ + $(CACHETOOL) getcommitid $(CONGRESS_REPO) $(CONGRESS_CHANGE) > .cachedata; \ + else \ + $(CACHETOOL) getcommitid $(CONGRESS_REPO) $(CONGRESS_BRANCH) > .cachedata; \ + fi + @sha1sum Makefile | awk {'print $$1'} >> .cachedata + @sha1sum config.mk | awk {'print $$1'} >> .cachedata + @echo -n $(UBUNTU_ARCH) | sha1sum | awk {'print $$1'} >> .cachedata + @cat .cachedata | $(CACHETOOL) getid > .cacheid + +# Clean local data related to caching - called prior to ordinary build +.PHONY: clean-cache +clean-cache: clean + @rm -f .cachedata .cacheid + +# Try to download cache - called prior to ordinary build +.PHONY: get-cache +get-cache: .cacheid + @if $(CACHETOOL) check $(shell cat .cacheid); then \ + $(CACHETOOL) get $(shell cat .cacheid) | tar xf -;\ + else \ + echo "No cache item found for $(shell cat .cacheid)" ;\ + exit 0;\ + fi + +# Store cache if not already stored - called after ordinary build +.PHONY: put-cache +put-cache: .cacheid + @tar cf - .congressbuild congress*.rpm gitinfo_congressplugin.txt | $(CACHETOOL) put $(shell cat .cacheid) diff --git a/build/f_isoroot/f_congress-pluginbuild/config.mk b/build/f_isoroot/f_congress-pluginbuild/config.mk new file mode 100644 index 000000000..5c241a127 --- /dev/null +++ b/build/f_isoroot/f_congress-pluginbuild/config.mk @@ -0,0 +1,12 @@ +############################################################################## +# Copyright (c) 2016 Mirantis Inc and others. +# fzhadaev@mirantis.com +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +CONGRESS_BRANCH?=master +CONGRESS_REPO?="https://github.com/openstack/fuel-plugin-congress" +CONGRESS_CHANGE?=adfa2db62988649219d64bd53746f2635d95aa43 diff --git a/deploy/config/plugins/fuel-congress_1.0.0.yaml b/deploy/config/plugins/fuel-congress_1.0.0.yaml new file mode 100644 index 000000000..c7ba8a138 --- /dev/null +++ b/deploy/config/plugins/fuel-congress_1.0.0.yaml @@ -0,0 +1,49 @@ +############################################################################## +# Copyright (c) 2016 Mirantis Inc and others. +# fzhadaev@mirantis.com +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +plugin-config-metadata: + title: Congress fuel plugin configuration template + version: 0.1 + created: 03.10.2016 + comment: None +congress: + metadata: + #chosen_id: Assigned during installation + class: plugin + default: false + enabled: true + label: Fuel Congress plugin + toggleable: true + versions: + - enabled: + description: Service enable state for congress-server + label: Enable + type: checkbox + value: true + weight: 25 + metadata: + contains_legacy_tasks: false + db_password: + generator: 'password' + group: openstack_services + hot_pluggable: false + #plugin_id: Assigned during installation + plugin_version: 1.0.0 + port: 1789 + service: congress-server + user: congress + user_password: + generator: 'password' + policies: + description: Set of policies to configure for congress (in JSON format) + label: Policies + type: text + value: '{}' + weight: 50 + weight: 70
\ No newline at end of file diff --git a/deploy/scenario/ha_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_heat_ceilometer_scenario.yaml index 4051c478a..6b032bfdd 100644 --- a/deploy/scenario/ha_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/ha_heat_ceilometer_scenario.yaml @@ -32,6 +32,9 @@ deployment-scenario-metadata: # <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml # It does so by copying the config file to the local plugin config directory stack-extensions: + - module: congress + module-config-name: fuel-congress + module-config-version: 1.0.0 ############################################################################## # By editing the override-config sections below, you can override arbitrary @@ -40,7 +43,7 @@ dea-override-config: nodes: - id: 1 interfaces: interfaces_1 - role: controller + role: controller, congress - id: 2 interfaces: interfaces_1 role: mongo, controller diff --git a/deploy/scenario/no-ha_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_heat_ceilometer_scenario.yaml index 3dd5f841e..801b9fca7 100644 --- a/deploy/scenario/no-ha_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/no-ha_heat_ceilometer_scenario.yaml @@ -32,6 +32,9 @@ deployment-scenario-metadata: # <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml # It does so by copying the config file to the local plugin config directory stack-extensions: + - module: congress + module-config-name: fuel-congress + module-config-version: 1.0.0 ############################################################################## # By editing the override-config sections below, you can override arbitrary @@ -40,7 +43,7 @@ dea-override-config: nodes: - id: 1 interfaces: interfaces_1 - role: mongo,controller + role: mongo,controller,congress - id: 2 interfaces: interfaces_1 role: ceph-osd,compute |