Cleanup not used element

We do not rely anymore on infra-cloud-networking element,
replaced by infra-cloud-bridge. So removing not needed
templates, and files from the manifest.
Also remove global vars for hpuswest, as this is not
used anymore.

Change-Id: Ie05d4c1e5bf5801cf0a3d2dd5cf5203c480ed53e
This commit is contained in:
Yolanda Robla Mota 2016-09-16 12:32:59 +02:00
parent cad3ddc59c
commit d7040706ba
5 changed files with 0 additions and 51 deletions

View File

@ -88,22 +88,6 @@ class infracloud::bifrost (
before => Exec['install bifrost'],
}
file { '/opt/stack/elements/infra-cloud-networking/static/etc/network/interfaces.d/eth2.cfg':
ensure => file,
content => template('infracloud/bifrost/interfaces.d/eth2.cfg.erb'),
require => File['/opt/stack/elements'],
}
file { "/opt/stack/elements/infra-cloud-networking/static/etc/network/interfaces.d/eth2.${vlan}.cfg":
ensure => file,
content => template('infracloud/bifrost/interfaces.d/eth2.tag.cfg.erb'),
require => File['/opt/stack/elements'],
}
file { "/opt/stack/elements/infra-cloud-networking/static/etc/network/interfaces.d/br-vlan${vlan}.cfg":
ensure => file,
content => template('infracloud/bifrost/interfaces.d/br-vlan.tag.cfg.erb'),
require => File['/opt/stack/elements'],
}
exec { 'install bifrost':
environment => ['BIFROST_INVENTORY_SOURCE=/opt/stack/baremetal.json', 'HOME=/root'],
command => "ansible-playbook -e @/etc/bifrost/bifrost_global_vars -vvvv \

View File

@ -1,22 +0,0 @@
network_interface: eth2
node_default_network_interface: eth2
node_network_info: "{}"
ipv4_subnet_mask: 255.255.255.192
ipv4_gateway: <%= @ipaddress_eth2 %>
ipv4_nameserver: 8.8.8.8
addressing_mode: "dhcp"
dhcp_pool_start: 10.10.16.144
dhcp_pool_end: 10.10.16.190
inventory_dhcp: true
dib_os_element: "ubuntu-minimal"
dib_packages: "openssh-server,vlan,vim,less,bridge-utils,language-pack-en,iputils-ping,rsyslog"
dib_trace: true
extra_dib_elements: "devuser infra-cloud-networking puppet growroot"
mysql_password: <%= @mysql_password %>
ironic_db_password: <%= @ironic_db_password %>
dib_env_vars:
DIB_INSTALLTYPE_simple_init: repo
DIB_DEV_USER_USERNAME: "baremetal"
DIB_DEV_USER_PWDLESS_SUDO: "Y"
ELEMENTS_PATH: "/opt/stack/diskimage-builder/elements:/opt/stack/elements:/opt/project-config/nodepool/elements"
extra_kernel_options: intel_iommu=off

View File

@ -1,7 +0,0 @@
auto br-vlan<%= @vlan -%>
iface br-vlan<%= @vlan -%> inet dhcp
bridge_ports eth2.<%= @vlan -%>
bridge_hello 2
bridge_maxage 12
bridge_stp off
post-up ip route add default via <%= @gateway_ip -%> dev br-vlan<%= @vlan -%>

View File

@ -1,3 +0,0 @@
auto eth2
iface eth2 inet dhcp
post-up route del default dev eth2

View File

@ -1,3 +0,0 @@
auto eth2.<%= @vlan -%>
iface eth2.<%= @vlan -%> inet manual
vlan-raw-device eth2