Remove deprecated Ubuntu 14.04 facts
Partial-Bug: #1619027 Change-Id: Ie32f490bde2189be91883af7739afacb3f4c4104 Signed-off-by: Maksim Malchuk <mmalchuk@mirantis.com>
This commit is contained in:
parent
0e7a148f48
commit
93125c2a47
|
@ -0,0 +1,2 @@
|
|||
---
|
||||
:processorcount: 4
|
|
@ -0,0 +1,2 @@
|
|||
---
|
||||
:processorcount: 4
|
|
@ -0,0 +1,2 @@
|
|||
---
|
||||
:processorcount: 4
|
|
@ -1,21 +0,0 @@
|
|||
---
|
||||
:fqdn: 'node01.example.com'
|
||||
:hostname: 'node01'
|
||||
:physicalprocessorcount: '4'
|
||||
:processorcount: '4'
|
||||
:memorysize_mb: '32138.66'
|
||||
:memorysize: '31.39 GB'
|
||||
:kernel: 'Linux'
|
||||
:osfamily: 'Debian'
|
||||
:operatingsystem: 'Ubuntu'
|
||||
:operatingsystemrelease: '14.04'
|
||||
:operatingsystemmajrelease: '14'
|
||||
:lsbdistid: 'Ubuntu'
|
||||
:l3_fqdn_hostname: 'node01'
|
||||
:l3_default_route: '172.16.1.1'
|
||||
:concat_basedir: '/tmp/'
|
||||
:l23_os: 'ubuntu'
|
||||
:lsbdistcodename: 'trusty'
|
||||
:os_package_type: 'debian'
|
||||
:os_service_default: '<SERVICE DEFAULT>'
|
||||
:libvirt_package_version: '1.2.9'
|
|
@ -297,3 +297,5 @@
|
|||
ssh_client_version_release: "7.2"
|
||||
l2_ovs_vlan_splinters_need_for: ""
|
||||
is_pe: false
|
||||
os_service_default: "<SERVICE DEFAULT>"
|
||||
|
||||
|
|
|
@ -2580,7 +2580,7 @@ release:
|
|||
(HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
|
||||
RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
|
||||
scaled out LATER. 3 or more controllers are required for a true HA environment.
|
||||
name: Newton on Ubuntu 14.04
|
||||
name: Newton on Ubuntu 16.04
|
||||
operating_system: Ubuntu
|
||||
roles_metadata:
|
||||
base-os:
|
||||
|
|
|
@ -2531,7 +2531,7 @@ release:
|
|||
(HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
|
||||
RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
|
||||
scaled out LATER. 3 or more controllers are required for a true HA environment.
|
||||
name: Newton on Ubuntu 14.04
|
||||
name: Newton on Ubuntu 16.04
|
||||
operating_system: Ubuntu
|
||||
roles_metadata:
|
||||
base-os:
|
||||
|
|
|
@ -2626,7 +2626,7 @@ release:
|
|||
(HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
|
||||
RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
|
||||
scaled out LATER. 3 or more controllers are required for a true HA environment.
|
||||
name: Newton on Ubuntu 14.04
|
||||
name: Newton on Ubuntu 16.04
|
||||
operating_system: Ubuntu
|
||||
roles_metadata:
|
||||
base-os:
|
||||
|
|
|
@ -2531,7 +2531,7 @@ release:
|
|||
(HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
|
||||
RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
|
||||
scaled out LATER. 3 or more controllers are required for a true HA environment.
|
||||
name: Newton on Ubuntu 14.04
|
||||
name: Newton on Ubuntu 16.04
|
||||
operating_system: Ubuntu
|
||||
roles_metadata:
|
||||
base-os:
|
||||
|
|
|
@ -2626,7 +2626,7 @@ release:
|
|||
(HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
|
||||
RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
|
||||
scaled out LATER. 3 or more controllers are required for a true HA environment.
|
||||
name: Newton on Ubuntu 14.04
|
||||
name: Newton on Ubuntu 16.04
|
||||
operating_system: Ubuntu
|
||||
roles_metadata:
|
||||
base-os:
|
||||
|
|
|
@ -2531,7 +2531,7 @@ release:
|
|||
(HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
|
||||
RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
|
||||
scaled out LATER. 3 or more controllers are required for a true HA environment.
|
||||
name: Newton on Ubuntu 14.04
|
||||
name: Newton on Ubuntu 16.04
|
||||
operating_system: Ubuntu
|
||||
roles_metadata:
|
||||
base-os:
|
||||
|
|
|
@ -2298,7 +2298,7 @@ release:
|
|||
(HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
|
||||
RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
|
||||
scaled out LATER. 3 or more controllers are required for a true HA environment.
|
||||
name: Newton on Ubuntu 14.04
|
||||
name: Newton on Ubuntu 16.04
|
||||
operating_system: Ubuntu
|
||||
roles_metadata:
|
||||
base-os:
|
||||
|
|
|
@ -2428,7 +2428,7 @@ release:
|
|||
(HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
|
||||
RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
|
||||
scaled out LATER. 3 or more controllers are required for a true HA environment.
|
||||
name: Newton on Ubuntu 14.04
|
||||
name: Newton on Ubuntu 16.04
|
||||
operating_system: Ubuntu
|
||||
roles_metadata:
|
||||
base-os:
|
||||
|
|
|
@ -2434,7 +2434,7 @@ release:
|
|||
(HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
|
||||
RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
|
||||
scaled out LATER. 3 or more controllers are required for a true HA environment.
|
||||
name: Newton on Ubuntu 14.04
|
||||
name: Newton on Ubuntu 16.04
|
||||
operating_system: Ubuntu
|
||||
roles_metadata:
|
||||
base-os:
|
||||
|
|
|
@ -2661,7 +2661,7 @@ release:
|
|||
(HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
|
||||
RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
|
||||
scaled out LATER. 3 or more controllers are required for a true HA environment.
|
||||
name: Newton on Ubuntu 14.04
|
||||
name: Newton on Ubuntu 16.04
|
||||
operating_system: Ubuntu
|
||||
roles_metadata:
|
||||
base-os:
|
||||
|
|
|
@ -2612,7 +2612,7 @@ release:
|
|||
(HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
|
||||
RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
|
||||
scaled out LATER. 3 or more controllers are required for a true HA environment.
|
||||
name: Newton on Ubuntu 14.04
|
||||
name: Newton on Ubuntu 16.04
|
||||
operating_system: Ubuntu
|
||||
roles_metadata:
|
||||
base-os:
|
||||
|
|
|
@ -2710,7 +2710,7 @@ release:
|
|||
(HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
|
||||
RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
|
||||
scaled out LATER. 3 or more controllers are required for a true HA environment.
|
||||
name: Newton on Ubuntu 14.04
|
||||
name: Newton on Ubuntu 16.04
|
||||
operating_system: Ubuntu
|
||||
roles_metadata:
|
||||
base-os:
|
||||
|
|
|
@ -2612,7 +2612,7 @@ release:
|
|||
(HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
|
||||
RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
|
||||
scaled out LATER. 3 or more controllers are required for a true HA environment.
|
||||
name: Newton on Ubuntu 14.04
|
||||
name: Newton on Ubuntu 16.04
|
||||
operating_system: Ubuntu
|
||||
roles_metadata:
|
||||
base-os:
|
||||
|
|
|
@ -2076,7 +2076,7 @@ release:
|
|||
(HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
|
||||
RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
|
||||
scaled out LATER. 3 or more controllers are required for a true HA environment.
|
||||
name: Newton on Ubuntu 14.04
|
||||
name: Newton on Ubuntu 16.04
|
||||
operating_system: Ubuntu
|
||||
roles_metadata:
|
||||
base-os:
|
||||
|
|
|
@ -2524,7 +2524,7 @@ release:
|
|||
(HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
|
||||
RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
|
||||
scaled out LATER. 3 or more controllers are required for a true HA environment.
|
||||
name: Newton on Ubuntu 14.04
|
||||
name: Newton on Ubuntu 16.04
|
||||
operating_system: Ubuntu
|
||||
roles_metadata:
|
||||
base-os:
|
||||
|
|
|
@ -2523,7 +2523,7 @@ release:
|
|||
(HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
|
||||
RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
|
||||
scaled out LATER. 3 or more controllers are required for a true HA environment.
|
||||
name: Newton on Ubuntu 14.04
|
||||
name: Newton on Ubuntu 16.04
|
||||
operating_system: Ubuntu
|
||||
roles_metadata:
|
||||
base-os:
|
||||
|
|
|
@ -2528,7 +2528,7 @@ release:
|
|||
(HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
|
||||
RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
|
||||
scaled out LATER. 3 or more controllers are required for a true HA environment.
|
||||
name: Newton on Ubuntu 14.04
|
||||
name: Newton on Ubuntu 16.04
|
||||
operating_system: Ubuntu
|
||||
roles_metadata:
|
||||
base-os:
|
||||
|
|
|
@ -2658,7 +2658,7 @@ release:
|
|||
(HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
|
||||
RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
|
||||
scaled out LATER. 3 or more controllers are required for a true HA environment.
|
||||
name: Newton on Ubuntu 14.04
|
||||
name: Newton on Ubuntu 16.04
|
||||
operating_system: Ubuntu
|
||||
roles_metadata:
|
||||
base-os:
|
||||
|
|
|
@ -2528,7 +2528,7 @@ release:
|
|||
(HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
|
||||
RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
|
||||
scaled out LATER. 3 or more controllers are required for a true HA environment.
|
||||
name: Newton on Ubuntu 14.04
|
||||
name: Newton on Ubuntu 16.04
|
||||
operating_system: Ubuntu
|
||||
roles_metadata:
|
||||
base-os:
|
||||
|
|
|
@ -2658,7 +2658,7 @@ release:
|
|||
(HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
|
||||
RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
|
||||
scaled out LATER. 3 or more controllers are required for a true HA environment.
|
||||
name: Newton on Ubuntu 14.04
|
||||
name: Newton on Ubuntu 16.04
|
||||
operating_system: Ubuntu
|
||||
roles_metadata:
|
||||
base-os:
|
||||
|
|
|
@ -2528,7 +2528,7 @@ release:
|
|||
(HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
|
||||
RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
|
||||
scaled out LATER. 3 or more controllers are required for a true HA environment.
|
||||
name: Newton on Ubuntu 14.04
|
||||
name: Newton on Ubuntu 16.04
|
||||
operating_system: Ubuntu
|
||||
roles_metadata:
|
||||
base-os:
|
||||
|
|
|
@ -2525,7 +2525,7 @@ release:
|
|||
(HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
|
||||
RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
|
||||
scaled out LATER. 3 or more controllers are required for a true HA environment.
|
||||
name: Newton on Ubuntu 14.04
|
||||
name: Newton on Ubuntu 16.04
|
||||
operating_system: Ubuntu
|
||||
roles_metadata:
|
||||
base-os:
|
||||
|
|
|
@ -2476,7 +2476,7 @@ release:
|
|||
(HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
|
||||
RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
|
||||
scaled out LATER. 3 or more controllers are required for a true HA environment.
|
||||
name: Newton on Ubuntu 14.04
|
||||
name: Newton on Ubuntu 16.04
|
||||
operating_system: Ubuntu
|
||||
roles_metadata:
|
||||
base-os:
|
||||
|
|
|
@ -2571,7 +2571,7 @@ release:
|
|||
(HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
|
||||
RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
|
||||
scaled out LATER. 3 or more controllers are required for a true HA environment.
|
||||
name: Newton on Ubuntu 14.04
|
||||
name: Newton on Ubuntu 16.04
|
||||
operating_system: Ubuntu
|
||||
roles_metadata:
|
||||
base-os:
|
||||
|
|
|
@ -2435,7 +2435,7 @@ release:
|
|||
(HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
|
||||
RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
|
||||
scaled out LATER. 3 or more controllers are required for a true HA environment.
|
||||
name: Newton on Ubuntu 14.04
|
||||
name: Newton on Ubuntu 16.04
|
||||
operating_system: Ubuntu
|
||||
roles_metadata:
|
||||
base-os:
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
---
|
||||
ceilometer:
|
||||
workers: 4
|
||||
network_metadata:
|
||||
vips:
|
||||
management:
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
---
|
||||
workers_max: 4
|
||||
configuration:
|
||||
keystone_config:
|
||||
DEFAULT/default_publisher_id:
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
---
|
||||
nova:
|
||||
workers: 4
|
||||
configuration:
|
||||
nova_config:
|
||||
DEFAULT/debug:
|
||||
|
|
|
@ -30,7 +30,7 @@ module Noop
|
|||
end
|
||||
|
||||
def self.default_facts_file_name
|
||||
Pathname.new 'ubuntu14.yaml'
|
||||
Pathname.new 'ubuntu16.yaml'
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -68,7 +68,7 @@ module Noop
|
|||
opts.on('-y', '--yamls YAML1,YAML2', Array, 'Run only these hiera yamls. Example: "controller.yaml,compute.yaml"') do |yamls|
|
||||
@options[:filter_hiera] = yamls
|
||||
end
|
||||
opts.on('-f', '--facts FACTS1,FACTS2', Array, 'Run only these facts yamls. Example: "ubuntu14.yaml,centos7.yaml"') do |yamls|
|
||||
opts.on('-f', '--facts FACTS1,FACTS2', Array, 'Run only these facts yamls. Example: "ubuntu16.yaml,centos7.yaml"') do |yamls|
|
||||
@options[:filter_facts] = yamls
|
||||
end
|
||||
# opts.on('-e', '--examples STR1,STR2', Array, 'Run only these spec examples. Example: "should compile"') do |examples|
|
||||
|
|
|
@ -55,7 +55,7 @@ describe Noop::Task do
|
|||
end
|
||||
|
||||
it 'should have inspect' do
|
||||
expect(subject.inspect).to eq 'Task[Manifest: my/test.pp Spec: my/test_spec.rb Hiera: novanet-primary-controller.yaml Facts: ubuntu14.yaml Status: pending]'
|
||||
expect(subject.inspect).to eq 'Task[Manifest: my/test.pp Spec: my/test_spec.rb Hiera: novanet-primary-controller.yaml Facts: ubuntu16.yaml Status: pending]'
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -96,7 +96,7 @@ describe Noop::Task do
|
|||
context 'facts' do
|
||||
it 'has file_name_facts' do
|
||||
expect(subject.file_name_facts).to be_a Pathname
|
||||
expect(subject.file_name_facts.to_s).to eq 'ubuntu14.yaml'
|
||||
expect(subject.file_name_facts.to_s).to eq 'ubuntu16.yaml'
|
||||
end
|
||||
|
||||
it 'can set file_name_facts' do
|
||||
|
@ -113,7 +113,7 @@ describe Noop::Task do
|
|||
|
||||
it 'has file_path_facts' do
|
||||
expect(subject.file_path_facts).to be_a Pathname
|
||||
expect(subject.file_path_facts.to_s).to eq "#{root}/facts/ubuntu14.yaml"
|
||||
expect(subject.file_path_facts.to_s).to eq "#{root}/facts/ubuntu16.yaml"
|
||||
end
|
||||
|
||||
it 'has file_name_facts_override' do
|
||||
|
|
Loading…
Reference in New Issue