From 1ca39e1362e916059fc4ef6227e16b33d0dfd3df Mon Sep 17 00:00:00 2001 From: Guo Ruijing Date: Thu, 15 Jun 2017 18:08:16 -0700 Subject: cleanup: remove fuel-plugin since fuel@opnfv use mccp Change-Id: I42d9a9a187f7a709d44db36bb820087f726112bf Signed-off-by: Guo Ruijing --- src/fuel-plugin/README.md | 0 .../deployment_scripts/k8s-master-install.sh | 25 ------------ .../deployment_scripts/k8s-slave-install.sh | 15 -------- .../puppet/manifests/k8s-master-install.pp | 22 ----------- .../puppet/manifests/k8s-slave-install.pp | 15 -------- src/fuel-plugin/deployment_tasks.yaml | 44 ---------------------- src/fuel-plugin/environment_config.yaml | 19 ---------- src/fuel-plugin/metadata.yaml | 30 --------------- src/fuel-plugin/node_roles.yaml | 30 --------------- src/fuel-plugin/tasks.yaml | 1 - src/fuel-plugin/vagrant/Vagrantfile | 21 ----------- src/fuel-plugin/vagrant/build_fuel_plugin.sh | 8 ---- 12 files changed, 230 deletions(-) delete mode 100644 src/fuel-plugin/README.md delete mode 100755 src/fuel-plugin/deployment_scripts/k8s-master-install.sh delete mode 100755 src/fuel-plugin/deployment_scripts/k8s-slave-install.sh delete mode 100644 src/fuel-plugin/deployment_scripts/puppet/manifests/k8s-master-install.pp delete mode 100644 src/fuel-plugin/deployment_scripts/puppet/manifests/k8s-slave-install.pp delete mode 100644 src/fuel-plugin/deployment_tasks.yaml delete mode 100644 src/fuel-plugin/environment_config.yaml delete mode 100644 src/fuel-plugin/metadata.yaml delete mode 100644 src/fuel-plugin/node_roles.yaml delete mode 100644 src/fuel-plugin/tasks.yaml delete mode 100644 src/fuel-plugin/vagrant/Vagrantfile delete mode 100755 src/fuel-plugin/vagrant/build_fuel_plugin.sh diff --git a/src/fuel-plugin/README.md b/src/fuel-plugin/README.md deleted file mode 100644 index e69de29..0000000 diff --git a/src/fuel-plugin/deployment_scripts/k8s-master-install.sh b/src/fuel-plugin/deployment_scripts/k8s-master-install.sh deleted file mode 100755 index 6d05ede..0000000 --- a/src/fuel-plugin/deployment_scripts/k8s-master-install.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash -set -eux - -api_advertise_address=$1 -service_cidr=$2 -pod_network=$3 -pod_network_cidr=$4 -token='8c5adc.1cec8dbf339093f0' - -curl -s http://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add - -cat < "/etc/fuel/plugins/fuel-plugin-k8s-1.0/k8s-master-install.sh $k8s_mgmt_ips $service_cidr $pod_network $pod_network_cidr", - path => '/usr/bin:/usr/sbin:/bin:/sbin', - } -} elsif $operatingsystem == 'CentOS' { -} diff --git a/src/fuel-plugin/deployment_scripts/puppet/manifests/k8s-slave-install.pp b/src/fuel-plugin/deployment_scripts/puppet/manifests/k8s-slave-install.pp deleted file mode 100644 index 4e4863b..0000000 --- a/src/fuel-plugin/deployment_scripts/puppet/manifests/k8s-slave-install.pp +++ /dev/null @@ -1,15 +0,0 @@ -notice('MODULAR: k8s-slave-install') -# get options - -$network_metadata = hiera_hash('network_metadata') -$k8s_nodes_hash = get_nodes_hash_by_roles($network_metadata, ['k8s-master']) -$k8s_mgmt_ips_hash = get_node_to_ipaddr_map_by_network_role($k8s_nodes_hash, 'management') -$k8s_mgmt_ips = values($k8s_mgmt_ips_hash) - -if $operatingsystem == 'Ubuntu' { - exec { 'install k8s slave': - command => "/etc/fuel/plugins/fuel-plugin-k8s-1.0/k8s-slave-install.sh $k8s_mgmt_ips", - path => '/usr/bin:/usr/sbin:/bin:/sbin', - } -} elsif $operatingsystem == 'CentOS' { -} diff --git a/src/fuel-plugin/deployment_tasks.yaml b/src/fuel-plugin/deployment_tasks.yaml deleted file mode 100644 index be7ce74..0000000 --- a/src/fuel-plugin/deployment_tasks.yaml +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright (c) 2017 Intel Corporation -# -# 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. -- id: k8s - type: group - role: [k8s-master, k8s-slave] - requires: [deploy_start] - required_for: [deploy_end] - tasks: [hiera, setup_repositories, fuel_pkgs, globals, tools, logging, netconfig] - parameters: - strategy: - type: parallel - -- id: k8s-master-install - type: puppet - version: 2.0.0 - groups: [k8s-master] - required_for: [deploy_end] - requires: [netconfig] - parameters: - puppet_manifest: puppet/manifests/k8s-master-install.pp - puppet_modules: puppet/modules:/etc/puppet/modules - timeout: 720 - -- id: k8s-slave-install - type: puppet - version: 2.0.0 - groups: [k8s-slave] - required_for: [post_deployment_end] - requires: [post_deployment_start] - parameters: - puppet_manifest: puppet/manifests/k8s-slave-install.pp - puppet_modules: puppet/modules:/etc/puppet/modules - timeout: 720 diff --git a/src/fuel-plugin/environment_config.yaml b/src/fuel-plugin/environment_config.yaml deleted file mode 100644 index 631b777..0000000 --- a/src/fuel-plugin/environment_config.yaml +++ /dev/null @@ -1,19 +0,0 @@ -attributes: - pod_network: - weight: 21 - type: "select" - value: "weave" - label: "K8s POD network" - values: - - data: "flannel" - label: "Flannel" - - data: "weave" - label: "Weave" - description: "K8s POD network." - - pod_network_cidr: - value: '10.244.0.0/16' - label: 'k8s POD CIDR' - weight: 70 - type: "text" - description: 'K8s POD network CIDR.' diff --git a/src/fuel-plugin/metadata.yaml b/src/fuel-plugin/metadata.yaml deleted file mode 100644 index e78f7e1..0000000 --- a/src/fuel-plugin/metadata.yaml +++ /dev/null @@ -1,30 +0,0 @@ -# Plugin name -name: fuel-plugin-k8s -# Human-readable name for your plugin -title: Install k8s on bare metal -# Plugin version -version: '1.0.0' -# Description -description: 'This plugin provides to deploy k8s on bare metal' -# Required fuel version -fuel_version: ['10.0'] -# Specify license of your plugin -licenses: ['Apache License Version 2.0'] -# Specify author or company name -authors: ['ruijing.guo@intel.com'] -# A link to the plugin's page -homepage: 'https://gerrit.opnfv.org/gerrit/openretriever' -# Specify a group which your plugin implements, possible options: -# network, storage, storage::cinder, storage::glance, hypervisor -groups: ['network'] -is_hotpluggable: false -# The plugin is compatible with releases in the list -releases: - - os: ubuntu - version: newton-10.0 - mode: ['ha'] - deployment_scripts_path: deployment_scripts/ - repository_path: deployment_scripts/ - -# Version of plugin package -package_version: '4.0.0' diff --git a/src/fuel-plugin/node_roles.yaml b/src/fuel-plugin/node_roles.yaml deleted file mode 100644 index 1906dc2..0000000 --- a/src/fuel-plugin/node_roles.yaml +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (c) 2017 Intel Corporation -# -# 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. -k8s-master: - name: "k8s-master" - description: "Install K8s master on nodes with this role" - has_primary: false # whether has primary role or not - public_ip_required: false # whether requires public net or not - weight: 50 # weight that will be used for ordering on fuel ui - limits: - min: 0 - -k8s-slave: - name: "k8s-slave" - description: "Install K8s slave on nodes with this role" - has_primary: false # whether has primary role or not - public_ip_required: false # whether requires public net or not - weight: 50 # weight that will be used for ordering on fuel ui - limits: - min: 0 diff --git a/src/fuel-plugin/tasks.yaml b/src/fuel-plugin/tasks.yaml deleted file mode 100644 index fe51488..0000000 --- a/src/fuel-plugin/tasks.yaml +++ /dev/null @@ -1 +0,0 @@ -[] diff --git a/src/fuel-plugin/vagrant/Vagrantfile b/src/fuel-plugin/vagrant/Vagrantfile deleted file mode 100644 index 8f5e620..0000000 --- a/src/fuel-plugin/vagrant/Vagrantfile +++ /dev/null @@ -1,21 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -# Vagrantfile API/syntax version. Don't touch unless you know what you're doing! -VAGRANTFILE_API_VERSION = "2" - -Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - - config.vm.box = "ubuntu/trusty64" - - config.vm.define "fuel" do | h | - h.vm.host_name = "fuel" - h.vm.provision :shell, :inline => "/vagrant/build_fuel_plugin.sh", privileged: false - h.vm.synced_folder "..", "/fuel-plugin" - h.vm.provider :virtualbox do |v| - v.customize ["modifyvm", :id, "--memory", 4096] - v.customize ["modifyvm", :id, "--cpus", 4] - v.customize "post-boot",["controlvm", :id, "setlinkstate1", "on"] - end - end -end diff --git a/src/fuel-plugin/vagrant/build_fuel_plugin.sh b/src/fuel-plugin/vagrant/build_fuel_plugin.sh deleted file mode 100755 index 4cd579f..0000000 --- a/src/fuel-plugin/vagrant/build_fuel_plugin.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -sudo apt-get update -y -sudo apt-get install -y ruby-dev rubygems-integration python-pip rpm createrepo dpkg-dev -sudo gem install fpm -sudo pip install fuel-plugin-builder -cp -r /fuel-plugin /home/vagrant -cd /home/vagrant/fuel-plugin; fpb --debug --build . -cp /home/vagrant/fuel-plugin/*.rpm /vagrant -- cgit 1.2.3-korg