From 93125c2a47b89d6575ac846ecae1f37e99237068 Mon Sep 17 00:00:00 2001 From: Maksim Malchuk Date: Fri, 2 Sep 2016 23:20:29 +0300 Subject: [PATCH] Remove deprecated Ubuntu 14.04 facts Partial-Bug: #1619027 Change-Id: Ie32f490bde2189be91883af7739afacb3f4c4104 Signed-off-by: Maksim Malchuk --- facts/override/keystone-keystone.yaml | 2 ++ .../openstack-cinder-openstack-cinder.yaml | 2 ++ ...stack-controller-openstack-controller.yaml | 2 ++ facts/ubuntu14.yaml | 21 ------------------- facts/ubuntu16.yaml | 2 ++ ..._tun.ceph.murano.sahara.ceil-ceph-osd.yaml | 2 +- ...t_tun.ceph.murano.sahara.ceil-compute.yaml | 2 +- ...un.ceph.murano.sahara.ceil-controller.yaml | 2 +- ...eut_tun.ceph.murano.sahara.ceil-mongo.yaml | 2 +- ...murano.sahara.ceil-primary-controller.yaml | 2 +- ...ceph.murano.sahara.ceil-primary-mongo.yaml | 2 +- hiera/neut_tun.ironic-ironic.yaml | 2 +- hiera/neut_tun.ironic-primary-controller.yaml | 2 +- ...un.l3ha.nova_quota-primary-controller.yaml | 2 +- ....sahara.ceil.ceph.public_ssl-ceph-osd.yaml | 2 +- ...o.sahara.ceil.ceph.public_ssl-compute.yaml | 2 +- ...il.ceph.public_ssl-primary-controller.yaml | 2 +- ...ra.ceil.ceph.public_ssl-primary-mongo.yaml | 2 +- hiera/neut_tun.vms_conf-virt.yaml | 2 +- ...urano.sahara.ceil-cinder-block-device.yaml | 2 +- ...vlan.cblock.murano.sahara.ceil-cinder.yaml | 2 +- ...lan.cblock.murano.sahara.ceil-compute.yaml | 2 +- ....cblock.murano.sahara.ceil-controller.yaml | 2 +- ..._vlan.cblock.murano.sahara.ceil-mongo.yaml | 2 +- ...murano.sahara.ceil-primary-controller.yaml | 2 +- ...lock.murano.sahara.ceil-primary-mongo.yaml | 2 +- hiera/neut_vlan.ceph-ceph-osd.yaml | 2 +- hiera/neut_vlan.ceph-compute.yaml | 2 +- hiera/neut_vlan.ceph-primary-controller.yaml | 2 +- hiera/neut_vlan.dvr-primary-controller.yaml | 2 +- hiera/override/ceilometer-controller.yaml | 3 +++ hiera/override/keystone-keystone.yaml | 1 + ...stack-controller-openstack-controller.yaml | 2 ++ lib/noop/config/facts.rb | 2 +- lib/noop/manager/options.rb | 2 +- spec/lib/task_spec.rb | 6 +++--- 36 files changed, 44 insertions(+), 51 deletions(-) create mode 100644 facts/override/keystone-keystone.yaml create mode 100644 facts/override/openstack-cinder-openstack-cinder.yaml create mode 100644 facts/override/openstack-controller-openstack-controller.yaml delete mode 100644 facts/ubuntu14.yaml diff --git a/facts/override/keystone-keystone.yaml b/facts/override/keystone-keystone.yaml new file mode 100644 index 0000000..173e013 --- /dev/null +++ b/facts/override/keystone-keystone.yaml @@ -0,0 +1,2 @@ +--- +:processorcount: 4 diff --git a/facts/override/openstack-cinder-openstack-cinder.yaml b/facts/override/openstack-cinder-openstack-cinder.yaml new file mode 100644 index 0000000..173e013 --- /dev/null +++ b/facts/override/openstack-cinder-openstack-cinder.yaml @@ -0,0 +1,2 @@ +--- +:processorcount: 4 diff --git a/facts/override/openstack-controller-openstack-controller.yaml b/facts/override/openstack-controller-openstack-controller.yaml new file mode 100644 index 0000000..173e013 --- /dev/null +++ b/facts/override/openstack-controller-openstack-controller.yaml @@ -0,0 +1,2 @@ +--- +:processorcount: 4 diff --git a/facts/ubuntu14.yaml b/facts/ubuntu14.yaml deleted file mode 100644 index f842575..0000000 --- a/facts/ubuntu14.yaml +++ /dev/null @@ -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: '' -:libvirt_package_version: '1.2.9' diff --git a/facts/ubuntu16.yaml b/facts/ubuntu16.yaml index 3579f2f..b2b5060 100644 --- a/facts/ubuntu16.yaml +++ b/facts/ubuntu16.yaml @@ -297,3 +297,5 @@ ssh_client_version_release: "7.2" l2_ovs_vlan_splinters_need_for: "" is_pe: false + os_service_default: "" + diff --git a/hiera/neut_tun.ceph.murano.sahara.ceil-ceph-osd.yaml b/hiera/neut_tun.ceph.murano.sahara.ceil-ceph-osd.yaml index a796def..ee7f62b 100644 --- a/hiera/neut_tun.ceph.murano.sahara.ceil-ceph-osd.yaml +++ b/hiera/neut_tun.ceph.murano.sahara.ceil-ceph-osd.yaml @@ -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: diff --git a/hiera/neut_tun.ceph.murano.sahara.ceil-compute.yaml b/hiera/neut_tun.ceph.murano.sahara.ceil-compute.yaml index 9fd1462..b6bb8e2 100644 --- a/hiera/neut_tun.ceph.murano.sahara.ceil-compute.yaml +++ b/hiera/neut_tun.ceph.murano.sahara.ceil-compute.yaml @@ -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: diff --git a/hiera/neut_tun.ceph.murano.sahara.ceil-controller.yaml b/hiera/neut_tun.ceph.murano.sahara.ceil-controller.yaml index 298fc74..5059847 100644 --- a/hiera/neut_tun.ceph.murano.sahara.ceil-controller.yaml +++ b/hiera/neut_tun.ceph.murano.sahara.ceil-controller.yaml @@ -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: diff --git a/hiera/neut_tun.ceph.murano.sahara.ceil-mongo.yaml b/hiera/neut_tun.ceph.murano.sahara.ceil-mongo.yaml index 5eadc5c..777a490 100644 --- a/hiera/neut_tun.ceph.murano.sahara.ceil-mongo.yaml +++ b/hiera/neut_tun.ceph.murano.sahara.ceil-mongo.yaml @@ -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: diff --git a/hiera/neut_tun.ceph.murano.sahara.ceil-primary-controller.yaml b/hiera/neut_tun.ceph.murano.sahara.ceil-primary-controller.yaml index 5ee1083..34549fd 100644 --- a/hiera/neut_tun.ceph.murano.sahara.ceil-primary-controller.yaml +++ b/hiera/neut_tun.ceph.murano.sahara.ceil-primary-controller.yaml @@ -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: diff --git a/hiera/neut_tun.ceph.murano.sahara.ceil-primary-mongo.yaml b/hiera/neut_tun.ceph.murano.sahara.ceil-primary-mongo.yaml index 6ed96ab..61604c4 100644 --- a/hiera/neut_tun.ceph.murano.sahara.ceil-primary-mongo.yaml +++ b/hiera/neut_tun.ceph.murano.sahara.ceil-primary-mongo.yaml @@ -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: diff --git a/hiera/neut_tun.ironic-ironic.yaml b/hiera/neut_tun.ironic-ironic.yaml index 3e79811..e8ba865 100644 --- a/hiera/neut_tun.ironic-ironic.yaml +++ b/hiera/neut_tun.ironic-ironic.yaml @@ -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: diff --git a/hiera/neut_tun.ironic-primary-controller.yaml b/hiera/neut_tun.ironic-primary-controller.yaml index 136e5c8..0213c86 100644 --- a/hiera/neut_tun.ironic-primary-controller.yaml +++ b/hiera/neut_tun.ironic-primary-controller.yaml @@ -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: diff --git a/hiera/neut_tun.l3ha.nova_quota-primary-controller.yaml b/hiera/neut_tun.l3ha.nova_quota-primary-controller.yaml index 22eea11..976100f 100644 --- a/hiera/neut_tun.l3ha.nova_quota-primary-controller.yaml +++ b/hiera/neut_tun.l3ha.nova_quota-primary-controller.yaml @@ -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: diff --git a/hiera/neut_tun.multirack.murano.sahara.ceil.ceph.public_ssl-ceph-osd.yaml b/hiera/neut_tun.multirack.murano.sahara.ceil.ceph.public_ssl-ceph-osd.yaml index 9f04fa9..f4d4269 100644 --- a/hiera/neut_tun.multirack.murano.sahara.ceil.ceph.public_ssl-ceph-osd.yaml +++ b/hiera/neut_tun.multirack.murano.sahara.ceil.ceph.public_ssl-ceph-osd.yaml @@ -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: diff --git a/hiera/neut_tun.multirack.murano.sahara.ceil.ceph.public_ssl-compute.yaml b/hiera/neut_tun.multirack.murano.sahara.ceil.ceph.public_ssl-compute.yaml index 3a87757..4fd37a7 100644 --- a/hiera/neut_tun.multirack.murano.sahara.ceil.ceph.public_ssl-compute.yaml +++ b/hiera/neut_tun.multirack.murano.sahara.ceil.ceph.public_ssl-compute.yaml @@ -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: diff --git a/hiera/neut_tun.multirack.murano.sahara.ceil.ceph.public_ssl-primary-controller.yaml b/hiera/neut_tun.multirack.murano.sahara.ceil.ceph.public_ssl-primary-controller.yaml index e3b58f8..c78d16b 100644 --- a/hiera/neut_tun.multirack.murano.sahara.ceil.ceph.public_ssl-primary-controller.yaml +++ b/hiera/neut_tun.multirack.murano.sahara.ceil.ceph.public_ssl-primary-controller.yaml @@ -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: diff --git a/hiera/neut_tun.multirack.murano.sahara.ceil.ceph.public_ssl-primary-mongo.yaml b/hiera/neut_tun.multirack.murano.sahara.ceil.ceph.public_ssl-primary-mongo.yaml index 0250a42..1eb2789 100644 --- a/hiera/neut_tun.multirack.murano.sahara.ceil.ceph.public_ssl-primary-mongo.yaml +++ b/hiera/neut_tun.multirack.murano.sahara.ceil.ceph.public_ssl-primary-mongo.yaml @@ -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: diff --git a/hiera/neut_tun.vms_conf-virt.yaml b/hiera/neut_tun.vms_conf-virt.yaml index a6d99c1..e279418 100644 --- a/hiera/neut_tun.vms_conf-virt.yaml +++ b/hiera/neut_tun.vms_conf-virt.yaml @@ -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: diff --git a/hiera/neut_vlan.cblock.murano.sahara.ceil-cinder-block-device.yaml b/hiera/neut_vlan.cblock.murano.sahara.ceil-cinder-block-device.yaml index c92c9c5..e182cfb 100644 --- a/hiera/neut_vlan.cblock.murano.sahara.ceil-cinder-block-device.yaml +++ b/hiera/neut_vlan.cblock.murano.sahara.ceil-cinder-block-device.yaml @@ -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: diff --git a/hiera/neut_vlan.cblock.murano.sahara.ceil-cinder.yaml b/hiera/neut_vlan.cblock.murano.sahara.ceil-cinder.yaml index 08f9672..f32ef79 100644 --- a/hiera/neut_vlan.cblock.murano.sahara.ceil-cinder.yaml +++ b/hiera/neut_vlan.cblock.murano.sahara.ceil-cinder.yaml @@ -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: diff --git a/hiera/neut_vlan.cblock.murano.sahara.ceil-compute.yaml b/hiera/neut_vlan.cblock.murano.sahara.ceil-compute.yaml index b726dc6..680d30c 100644 --- a/hiera/neut_vlan.cblock.murano.sahara.ceil-compute.yaml +++ b/hiera/neut_vlan.cblock.murano.sahara.ceil-compute.yaml @@ -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: diff --git a/hiera/neut_vlan.cblock.murano.sahara.ceil-controller.yaml b/hiera/neut_vlan.cblock.murano.sahara.ceil-controller.yaml index 9e61629..83515bc 100644 --- a/hiera/neut_vlan.cblock.murano.sahara.ceil-controller.yaml +++ b/hiera/neut_vlan.cblock.murano.sahara.ceil-controller.yaml @@ -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: diff --git a/hiera/neut_vlan.cblock.murano.sahara.ceil-mongo.yaml b/hiera/neut_vlan.cblock.murano.sahara.ceil-mongo.yaml index 86a675a..9501090 100644 --- a/hiera/neut_vlan.cblock.murano.sahara.ceil-mongo.yaml +++ b/hiera/neut_vlan.cblock.murano.sahara.ceil-mongo.yaml @@ -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: diff --git a/hiera/neut_vlan.cblock.murano.sahara.ceil-primary-controller.yaml b/hiera/neut_vlan.cblock.murano.sahara.ceil-primary-controller.yaml index 10b889c..9d0ffbd 100644 --- a/hiera/neut_vlan.cblock.murano.sahara.ceil-primary-controller.yaml +++ b/hiera/neut_vlan.cblock.murano.sahara.ceil-primary-controller.yaml @@ -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: diff --git a/hiera/neut_vlan.cblock.murano.sahara.ceil-primary-mongo.yaml b/hiera/neut_vlan.cblock.murano.sahara.ceil-primary-mongo.yaml index 6ce2153..fbda221 100644 --- a/hiera/neut_vlan.cblock.murano.sahara.ceil-primary-mongo.yaml +++ b/hiera/neut_vlan.cblock.murano.sahara.ceil-primary-mongo.yaml @@ -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: diff --git a/hiera/neut_vlan.ceph-ceph-osd.yaml b/hiera/neut_vlan.ceph-ceph-osd.yaml index e768e35..4dad84b 100644 --- a/hiera/neut_vlan.ceph-ceph-osd.yaml +++ b/hiera/neut_vlan.ceph-ceph-osd.yaml @@ -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: diff --git a/hiera/neut_vlan.ceph-compute.yaml b/hiera/neut_vlan.ceph-compute.yaml index 41c3b0d..88ded71 100644 --- a/hiera/neut_vlan.ceph-compute.yaml +++ b/hiera/neut_vlan.ceph-compute.yaml @@ -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: diff --git a/hiera/neut_vlan.ceph-primary-controller.yaml b/hiera/neut_vlan.ceph-primary-controller.yaml index 5e7c83f..c25d3a2 100644 --- a/hiera/neut_vlan.ceph-primary-controller.yaml +++ b/hiera/neut_vlan.ceph-primary-controller.yaml @@ -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: diff --git a/hiera/neut_vlan.dvr-primary-controller.yaml b/hiera/neut_vlan.dvr-primary-controller.yaml index d59e453..2dbe06f 100644 --- a/hiera/neut_vlan.dvr-primary-controller.yaml +++ b/hiera/neut_vlan.dvr-primary-controller.yaml @@ -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: diff --git a/hiera/override/ceilometer-controller.yaml b/hiera/override/ceilometer-controller.yaml index be733a8..5b9d088 100644 --- a/hiera/override/ceilometer-controller.yaml +++ b/hiera/override/ceilometer-controller.yaml @@ -1,3 +1,6 @@ +--- +ceilometer: + workers: 4 network_metadata: vips: management: diff --git a/hiera/override/keystone-keystone.yaml b/hiera/override/keystone-keystone.yaml index 7a369bc..6f77491 100644 --- a/hiera/override/keystone-keystone.yaml +++ b/hiera/override/keystone-keystone.yaml @@ -1,4 +1,5 @@ --- +workers_max: 4 configuration: keystone_config: DEFAULT/default_publisher_id: diff --git a/hiera/override/openstack-controller-openstack-controller.yaml b/hiera/override/openstack-controller-openstack-controller.yaml index bc19a37..3c13b07 100644 --- a/hiera/override/openstack-controller-openstack-controller.yaml +++ b/hiera/override/openstack-controller-openstack-controller.yaml @@ -1,4 +1,6 @@ --- +nova: + workers: 4 configuration: nova_config: DEFAULT/debug: diff --git a/lib/noop/config/facts.rb b/lib/noop/config/facts.rb index ebc4c2c..d6c1311 100644 --- a/lib/noop/config/facts.rb +++ b/lib/noop/config/facts.rb @@ -30,7 +30,7 @@ module Noop end def self.default_facts_file_name - Pathname.new 'ubuntu14.yaml' + Pathname.new 'ubuntu16.yaml' end end end diff --git a/lib/noop/manager/options.rb b/lib/noop/manager/options.rb index b37e113..24af41a 100644 --- a/lib/noop/manager/options.rb +++ b/lib/noop/manager/options.rb @@ -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| diff --git a/spec/lib/task_spec.rb b/spec/lib/task_spec.rb index 6f6805e..d3e6ba2 100644 --- a/spec/lib/task_spec.rb +++ b/spec/lib/task_spec.rb @@ -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