From fc5b5ab8604b37b635e17d0dec9179c4ae574efa Mon Sep 17 00:00:00 2001 From: jhh Date: Thu, 30 May 2019 19:59:07 -0500 Subject: [PATCH] Remove unsupported vagrant and update README Change-Id: I1f2c9723a3dae88da524ff4ec5b2b5c0aad813c5 Issue-ID: POLICY-1816 Signed-off-by: jhh --- README.md | 19 +++++-------------- vagrant/README.md | 13 ------------- vagrant/Vagrantfile | 30 ------------------------------ vagrant/setup_policy.sh | 48 ------------------------------------------------ 4 files changed, 5 insertions(+), 105 deletions(-) delete mode 100644 vagrant/README.md delete mode 100644 vagrant/Vagrantfile delete mode 100755 vagrant/setup_policy.sh diff --git a/README.md b/README.md index f0fca061..0447e07a 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,9 @@ -Copyright 2018 AT&T Intellectual Property. All rights reserved. +Copyright 2018-2019 AT&T Intellectual Property. All rights reserved. This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE Full license text at https://creativecommons.org/licenses/by/4.0/legalcode -This source repository contains the files for the ONAP Policy docker-compose configuration - -The following needs to be setup before using docker-compose: - -chmod +x config/drools/drools-tweaks.sh -IP_ADDRESS=$(ifconfig eth0 | grep "inet addr" | tr -s ' ' | cut -d' ' -f3 | cut -d':' -f2) -echo $IP_ADDRESS > config/pe/ip_addr.txt - -If you do not want the policies pre-loaded, then set this environment variable to false: - -export PRELOAD_POLICIES=false - -It will override the settings in the .env file. Which is set to true. +This source repository contains legacy docker-compose configurations used for CSIT +tests, and ONAP Heat instantiations. +Additionally, the policy-base/ and policy-common/ projects are used to generate +the OS base for policy images. diff --git a/vagrant/README.md b/vagrant/README.md deleted file mode 100644 index 837d62ce..00000000 --- a/vagrant/README.md +++ /dev/null @@ -1,13 +0,0 @@ -Copyright 2018 AT&T Intellectual Property. All rights reserved. -This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE -Full license text at https://creativecommons.org/licenses/by/4.0/legalcode - -This directory is to build & setup policy by vagrant. It is verified to work in -Ubuntu 16.04 64bit. - -To setup vagrant, run the followings: - -#sudo apt-get install -y virtualbox -#wget --no-check-certificate https://releases.hashicorp.com/vagrant/1.8.6/vagrant_1.8.6_x86_64.deb -#sudo dpkg -i vagrant_1.8.6_x86_64.deb -#vagrant up diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile deleted file mode 100644 index 35c022b0..00000000 --- a/vagrant/Vagrantfile +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 2018 AT&T Intellectual Property. All rights reserved -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -Vagrant.require_version ">= 1.8.6" -Vagrant.configure("2") do |config| - - config.vm.box = "bento/ubuntu-16.04" - config.vm.provider :virtualbox do |vb| - vb.customize ["modifyvm", :id, "--memory", 12288] - vb.customize ["modifyvm", :id, "--cpus", 8] - vb.customize "post-boot",["controlvm", :id, "setlinkstate1", "on"] - end - - config.vm.define "policy" do |config| - config.vm.hostname = "policy" - config.vm.network "private_network", ip: "192.168.0.10" - config.vm.provision "shell", path: "setup_policy.sh", privileged: false - end - -end diff --git a/vagrant/setup_policy.sh b/vagrant/setup_policy.sh deleted file mode 100755 index 18bb3284..00000000 --- a/vagrant/setup_policy.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env bash -# Copyright 2018 AT&T Intellectual Property. All rights reserved -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -ex - -sudo apt-get update -y -sudo apt-get install -y maven openjdk-8-jdk npm python-pip docker.io -sudo pip install docker-compose - -git clone http://gerrit.onap.org/r/oparent -mkdir $HOME/.m2 -cp oparent/settings.xml $HOME/.m2 - -for comp in common drools-pdp drools-applications engine -do - cd $HOME - git clone http://gerrit.onap.org/r/policy/$comp - cd $comp - mvn clean install -done - -for comp in policy-pe policy-drools -do - cd $HOME/$comp - sudo docker build -t onap/$comp packages/docker/target/$comp -done - -cd $HOME -git clone http://gerrit.onap.org/r/policy/docker -cd docker - -cd $HOME/docker -chmod +x config/drools/drools-tweaks.sh -echo 192.168.0.10 > config/pe/ip_addr.txt -export MTU=1500 -sudo -E docker-compose up -d -- 2.16.6