summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaksim Malchuk <mmalchuk@mirantis.com>2016-09-02 23:20:29 +0300
committerDmitry Ilyin <dilyin@mirantis.com>2016-09-06 08:28:19 -0500
commit93125c2a47b89d6575ac846ecae1f37e99237068 (patch)
treee10c15fb4faac5a3cdee6f632c16f7d876f102e7
parent0e7a148f48a3043207acab7a8462fda5604ff98f (diff)
Remove deprecated Ubuntu 14.04 facts
Partial-Bug: #1619027 Change-Id: Ie32f490bde2189be91883af7739afacb3f4c4104 Signed-off-by: Maksim Malchuk <mmalchuk@mirantis.com>
Notes
Notes (review): Code-Review+2: Maksim Malchuk <mmalchuk@mirantis.com> Verified+1: Fuel CI <fuel-ci-bot@mirantis.com> Code-Review+2: Dmitry Ilyin <dilyin@mirantis.com> Workflow+1: Dmitry Ilyin <dilyin@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 06 Sep 2016 17:18:45 +0000 Reviewed-on: https://review.openstack.org/365124 Project: openstack/fuel-noop-fixtures Branch: refs/heads/master
-rw-r--r--facts/override/keystone-keystone.yaml2
-rw-r--r--facts/override/openstack-cinder-openstack-cinder.yaml2
-rw-r--r--facts/override/openstack-controller-openstack-controller.yaml2
-rw-r--r--facts/ubuntu14.yaml21
-rw-r--r--facts/ubuntu16.yaml2
-rw-r--r--hiera/neut_tun.ceph.murano.sahara.ceil-ceph-osd.yaml2
-rw-r--r--hiera/neut_tun.ceph.murano.sahara.ceil-compute.yaml2
-rw-r--r--hiera/neut_tun.ceph.murano.sahara.ceil-controller.yaml2
-rw-r--r--hiera/neut_tun.ceph.murano.sahara.ceil-mongo.yaml2
-rw-r--r--hiera/neut_tun.ceph.murano.sahara.ceil-primary-controller.yaml2
-rw-r--r--hiera/neut_tun.ceph.murano.sahara.ceil-primary-mongo.yaml2
-rw-r--r--hiera/neut_tun.ironic-ironic.yaml2
-rw-r--r--hiera/neut_tun.ironic-primary-controller.yaml2
-rw-r--r--hiera/neut_tun.l3ha.nova_quota-primary-controller.yaml2
-rw-r--r--hiera/neut_tun.multirack.murano.sahara.ceil.ceph.public_ssl-ceph-osd.yaml2
-rw-r--r--hiera/neut_tun.multirack.murano.sahara.ceil.ceph.public_ssl-compute.yaml2
-rw-r--r--hiera/neut_tun.multirack.murano.sahara.ceil.ceph.public_ssl-primary-controller.yaml2
-rw-r--r--hiera/neut_tun.multirack.murano.sahara.ceil.ceph.public_ssl-primary-mongo.yaml2
-rw-r--r--hiera/neut_tun.vms_conf-virt.yaml2
-rw-r--r--hiera/neut_vlan.cblock.murano.sahara.ceil-cinder-block-device.yaml2
-rw-r--r--hiera/neut_vlan.cblock.murano.sahara.ceil-cinder.yaml2
-rw-r--r--hiera/neut_vlan.cblock.murano.sahara.ceil-compute.yaml2
-rw-r--r--hiera/neut_vlan.cblock.murano.sahara.ceil-controller.yaml2
-rw-r--r--hiera/neut_vlan.cblock.murano.sahara.ceil-mongo.yaml2
-rw-r--r--hiera/neut_vlan.cblock.murano.sahara.ceil-primary-controller.yaml2
-rw-r--r--hiera/neut_vlan.cblock.murano.sahara.ceil-primary-mongo.yaml2
-rw-r--r--hiera/neut_vlan.ceph-ceph-osd.yaml2
-rw-r--r--hiera/neut_vlan.ceph-compute.yaml2
-rw-r--r--hiera/neut_vlan.ceph-primary-controller.yaml2
-rw-r--r--hiera/neut_vlan.dvr-primary-controller.yaml2
-rw-r--r--hiera/override/ceilometer-controller.yaml3
-rw-r--r--hiera/override/keystone-keystone.yaml1
-rw-r--r--hiera/override/openstack-controller-openstack-controller.yaml2
-rw-r--r--lib/noop/config/facts.rb2
-rw-r--r--lib/noop/manager/options.rb2
-rw-r--r--spec/lib/task_spec.rb6
36 files changed, 44 insertions, 51 deletions
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 @@
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 @@
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 @@
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 @@
1---
2:fqdn: 'node01.example.com'
3:hostname: 'node01'
4:physicalprocessorcount: '4'
5:processorcount: '4'
6:memorysize_mb: '32138.66'
7:memorysize: '31.39 GB'
8:kernel: 'Linux'
9:osfamily: 'Debian'
10:operatingsystem: 'Ubuntu'
11:operatingsystemrelease: '14.04'
12:operatingsystemmajrelease: '14'
13:lsbdistid: 'Ubuntu'
14:l3_fqdn_hostname: 'node01'
15:l3_default_route: '172.16.1.1'
16:concat_basedir: '/tmp/'
17:l23_os: 'ubuntu'
18:lsbdistcodename: 'trusty'
19:os_package_type: 'debian'
20:os_service_default: '<SERVICE DEFAULT>'
21: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 @@
297 ssh_client_version_release: "7.2" 297 ssh_client_version_release: "7.2"
298 l2_ovs_vlan_splinters_need_for: "" 298 l2_ovs_vlan_splinters_need_for: ""
299 is_pe: false 299 is_pe: false
300 os_service_default: "<SERVICE DEFAULT>"
301
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:
2580 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera, 2580 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
2581 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or 2581 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
2582 scaled out LATER. 3 or more controllers are required for a true HA environment. 2582 scaled out LATER. 3 or more controllers are required for a true HA environment.
2583 name: Newton on Ubuntu 14.04 2583 name: Newton on Ubuntu 16.04
2584 operating_system: Ubuntu 2584 operating_system: Ubuntu
2585 roles_metadata: 2585 roles_metadata:
2586 base-os: 2586 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:
2531 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera, 2531 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
2532 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or 2532 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
2533 scaled out LATER. 3 or more controllers are required for a true HA environment. 2533 scaled out LATER. 3 or more controllers are required for a true HA environment.
2534 name: Newton on Ubuntu 14.04 2534 name: Newton on Ubuntu 16.04
2535 operating_system: Ubuntu 2535 operating_system: Ubuntu
2536 roles_metadata: 2536 roles_metadata:
2537 base-os: 2537 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:
2626 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera, 2626 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
2627 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or 2627 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
2628 scaled out LATER. 3 or more controllers are required for a true HA environment. 2628 scaled out LATER. 3 or more controllers are required for a true HA environment.
2629 name: Newton on Ubuntu 14.04 2629 name: Newton on Ubuntu 16.04
2630 operating_system: Ubuntu 2630 operating_system: Ubuntu
2631 roles_metadata: 2631 roles_metadata:
2632 base-os: 2632 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:
2531 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera, 2531 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
2532 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or 2532 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
2533 scaled out LATER. 3 or more controllers are required for a true HA environment. 2533 scaled out LATER. 3 or more controllers are required for a true HA environment.
2534 name: Newton on Ubuntu 14.04 2534 name: Newton on Ubuntu 16.04
2535 operating_system: Ubuntu 2535 operating_system: Ubuntu
2536 roles_metadata: 2536 roles_metadata:
2537 base-os: 2537 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:
2626 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera, 2626 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
2627 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or 2627 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
2628 scaled out LATER. 3 or more controllers are required for a true HA environment. 2628 scaled out LATER. 3 or more controllers are required for a true HA environment.
2629 name: Newton on Ubuntu 14.04 2629 name: Newton on Ubuntu 16.04
2630 operating_system: Ubuntu 2630 operating_system: Ubuntu
2631 roles_metadata: 2631 roles_metadata:
2632 base-os: 2632 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:
2531 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera, 2531 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
2532 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or 2532 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
2533 scaled out LATER. 3 or more controllers are required for a true HA environment. 2533 scaled out LATER. 3 or more controllers are required for a true HA environment.
2534 name: Newton on Ubuntu 14.04 2534 name: Newton on Ubuntu 16.04
2535 operating_system: Ubuntu 2535 operating_system: Ubuntu
2536 roles_metadata: 2536 roles_metadata:
2537 base-os: 2537 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:
2298 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera, 2298 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
2299 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or 2299 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
2300 scaled out LATER. 3 or more controllers are required for a true HA environment. 2300 scaled out LATER. 3 or more controllers are required for a true HA environment.
2301 name: Newton on Ubuntu 14.04 2301 name: Newton on Ubuntu 16.04
2302 operating_system: Ubuntu 2302 operating_system: Ubuntu
2303 roles_metadata: 2303 roles_metadata:
2304 base-os: 2304 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:
2428 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera, 2428 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
2429 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or 2429 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
2430 scaled out LATER. 3 or more controllers are required for a true HA environment. 2430 scaled out LATER. 3 or more controllers are required for a true HA environment.
2431 name: Newton on Ubuntu 14.04 2431 name: Newton on Ubuntu 16.04
2432 operating_system: Ubuntu 2432 operating_system: Ubuntu
2433 roles_metadata: 2433 roles_metadata:
2434 base-os: 2434 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:
2434 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera, 2434 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
2435 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or 2435 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
2436 scaled out LATER. 3 or more controllers are required for a true HA environment. 2436 scaled out LATER. 3 or more controllers are required for a true HA environment.
2437 name: Newton on Ubuntu 14.04 2437 name: Newton on Ubuntu 16.04
2438 operating_system: Ubuntu 2438 operating_system: Ubuntu
2439 roles_metadata: 2439 roles_metadata:
2440 base-os: 2440 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:
2661 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera, 2661 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
2662 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or 2662 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
2663 scaled out LATER. 3 or more controllers are required for a true HA environment. 2663 scaled out LATER. 3 or more controllers are required for a true HA environment.
2664 name: Newton on Ubuntu 14.04 2664 name: Newton on Ubuntu 16.04
2665 operating_system: Ubuntu 2665 operating_system: Ubuntu
2666 roles_metadata: 2666 roles_metadata:
2667 base-os: 2667 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:
2612 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera, 2612 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
2613 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or 2613 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
2614 scaled out LATER. 3 or more controllers are required for a true HA environment. 2614 scaled out LATER. 3 or more controllers are required for a true HA environment.
2615 name: Newton on Ubuntu 14.04 2615 name: Newton on Ubuntu 16.04
2616 operating_system: Ubuntu 2616 operating_system: Ubuntu
2617 roles_metadata: 2617 roles_metadata:
2618 base-os: 2618 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:
2710 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera, 2710 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
2711 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or 2711 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
2712 scaled out LATER. 3 or more controllers are required for a true HA environment. 2712 scaled out LATER. 3 or more controllers are required for a true HA environment.
2713 name: Newton on Ubuntu 14.04 2713 name: Newton on Ubuntu 16.04
2714 operating_system: Ubuntu 2714 operating_system: Ubuntu
2715 roles_metadata: 2715 roles_metadata:
2716 base-os: 2716 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:
2612 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera, 2612 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
2613 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or 2613 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
2614 scaled out LATER. 3 or more controllers are required for a true HA environment. 2614 scaled out LATER. 3 or more controllers are required for a true HA environment.
2615 name: Newton on Ubuntu 14.04 2615 name: Newton on Ubuntu 16.04
2616 operating_system: Ubuntu 2616 operating_system: Ubuntu
2617 roles_metadata: 2617 roles_metadata:
2618 base-os: 2618 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:
2076 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera, 2076 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
2077 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or 2077 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
2078 scaled out LATER. 3 or more controllers are required for a true HA environment. 2078 scaled out LATER. 3 or more controllers are required for a true HA environment.
2079 name: Newton on Ubuntu 14.04 2079 name: Newton on Ubuntu 16.04
2080 operating_system: Ubuntu 2080 operating_system: Ubuntu
2081 roles_metadata: 2081 roles_metadata:
2082 base-os: 2082 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:
2524 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera, 2524 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
2525 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or 2525 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
2526 scaled out LATER. 3 or more controllers are required for a true HA environment. 2526 scaled out LATER. 3 or more controllers are required for a true HA environment.
2527 name: Newton on Ubuntu 14.04 2527 name: Newton on Ubuntu 16.04
2528 operating_system: Ubuntu 2528 operating_system: Ubuntu
2529 roles_metadata: 2529 roles_metadata:
2530 base-os: 2530 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:
2523 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera, 2523 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
2524 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or 2524 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
2525 scaled out LATER. 3 or more controllers are required for a true HA environment. 2525 scaled out LATER. 3 or more controllers are required for a true HA environment.
2526 name: Newton on Ubuntu 14.04 2526 name: Newton on Ubuntu 16.04
2527 operating_system: Ubuntu 2527 operating_system: Ubuntu
2528 roles_metadata: 2528 roles_metadata:
2529 base-os: 2529 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:
2528 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera, 2528 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
2529 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or 2529 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
2530 scaled out LATER. 3 or more controllers are required for a true HA environment. 2530 scaled out LATER. 3 or more controllers are required for a true HA environment.
2531 name: Newton on Ubuntu 14.04 2531 name: Newton on Ubuntu 16.04
2532 operating_system: Ubuntu 2532 operating_system: Ubuntu
2533 roles_metadata: 2533 roles_metadata:
2534 base-os: 2534 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:
2658 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera, 2658 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
2659 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or 2659 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
2660 scaled out LATER. 3 or more controllers are required for a true HA environment. 2660 scaled out LATER. 3 or more controllers are required for a true HA environment.
2661 name: Newton on Ubuntu 14.04 2661 name: Newton on Ubuntu 16.04
2662 operating_system: Ubuntu 2662 operating_system: Ubuntu
2663 roles_metadata: 2663 roles_metadata:
2664 base-os: 2664 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:
2528 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera, 2528 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
2529 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or 2529 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
2530 scaled out LATER. 3 or more controllers are required for a true HA environment. 2530 scaled out LATER. 3 or more controllers are required for a true HA environment.
2531 name: Newton on Ubuntu 14.04 2531 name: Newton on Ubuntu 16.04
2532 operating_system: Ubuntu 2532 operating_system: Ubuntu
2533 roles_metadata: 2533 roles_metadata:
2534 base-os: 2534 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:
2658 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera, 2658 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
2659 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or 2659 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
2660 scaled out LATER. 3 or more controllers are required for a true HA environment. 2660 scaled out LATER. 3 or more controllers are required for a true HA environment.
2661 name: Newton on Ubuntu 14.04 2661 name: Newton on Ubuntu 16.04
2662 operating_system: Ubuntu 2662 operating_system: Ubuntu
2663 roles_metadata: 2663 roles_metadata:
2664 base-os: 2664 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:
2528 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera, 2528 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
2529 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or 2529 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
2530 scaled out LATER. 3 or more controllers are required for a true HA environment. 2530 scaled out LATER. 3 or more controllers are required for a true HA environment.
2531 name: Newton on Ubuntu 14.04 2531 name: Newton on Ubuntu 16.04
2532 operating_system: Ubuntu 2532 operating_system: Ubuntu
2533 roles_metadata: 2533 roles_metadata:
2534 base-os: 2534 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:
2525 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera, 2525 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
2526 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or 2526 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
2527 scaled out LATER. 3 or more controllers are required for a true HA environment. 2527 scaled out LATER. 3 or more controllers are required for a true HA environment.
2528 name: Newton on Ubuntu 14.04 2528 name: Newton on Ubuntu 16.04
2529 operating_system: Ubuntu 2529 operating_system: Ubuntu
2530 roles_metadata: 2530 roles_metadata:
2531 base-os: 2531 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:
2476 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera, 2476 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
2477 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or 2477 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
2478 scaled out LATER. 3 or more controllers are required for a true HA environment. 2478 scaled out LATER. 3 or more controllers are required for a true HA environment.
2479 name: Newton on Ubuntu 14.04 2479 name: Newton on Ubuntu 16.04
2480 operating_system: Ubuntu 2480 operating_system: Ubuntu
2481 roles_metadata: 2481 roles_metadata:
2482 base-os: 2482 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:
2571 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera, 2571 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
2572 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or 2572 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
2573 scaled out LATER. 3 or more controllers are required for a true HA environment. 2573 scaled out LATER. 3 or more controllers are required for a true HA environment.
2574 name: Newton on Ubuntu 14.04 2574 name: Newton on Ubuntu 16.04
2575 operating_system: Ubuntu 2575 operating_system: Ubuntu
2576 roles_metadata: 2576 roles_metadata:
2577 base-os: 2577 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:
2435 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera, 2435 (HA). Controller services are prepared for HA by setting up a base MySQL/Galera,
2436 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or 2436 RabbitMQ and HAProxy so that additional controllers can be deployed NOW, or
2437 scaled out LATER. 3 or more controllers are required for a true HA environment. 2437 scaled out LATER. 3 or more controllers are required for a true HA environment.
2438 name: Newton on Ubuntu 14.04 2438 name: Newton on Ubuntu 16.04
2439 operating_system: Ubuntu 2439 operating_system: Ubuntu
2440 roles_metadata: 2440 roles_metadata:
2441 base-os: 2441 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 @@
1---
2ceilometer:
3 workers: 4
1network_metadata: 4network_metadata:
2 vips: 5 vips:
3 management: 6 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 @@
1--- 1---
2workers_max: 4
2configuration: 3configuration:
3 keystone_config: 4 keystone_config:
4 DEFAULT/default_publisher_id: 5 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 @@
1--- 1---
2nova:
3 workers: 4
2configuration: 4configuration:
3 nova_config: 5 nova_config:
4 DEFAULT/debug: 6 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
30 end 30 end
31 31
32 def self.default_facts_file_name 32 def self.default_facts_file_name
33 Pathname.new 'ubuntu14.yaml' 33 Pathname.new 'ubuntu16.yaml'
34 end 34 end
35 end 35 end
36end 36end
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
68 opts.on('-y', '--yamls YAML1,YAML2', Array, 'Run only these hiera yamls. Example: "controller.yaml,compute.yaml"') do |yamls| 68 opts.on('-y', '--yamls YAML1,YAML2', Array, 'Run only these hiera yamls. Example: "controller.yaml,compute.yaml"') do |yamls|
69 @options[:filter_hiera] = yamls 69 @options[:filter_hiera] = yamls
70 end 70 end
71 opts.on('-f', '--facts FACTS1,FACTS2', Array, 'Run only these facts yamls. Example: "ubuntu14.yaml,centos7.yaml"') do |yamls| 71 opts.on('-f', '--facts FACTS1,FACTS2', Array, 'Run only these facts yamls. Example: "ubuntu16.yaml,centos7.yaml"') do |yamls|
72 @options[:filter_facts] = yamls 72 @options[:filter_facts] = yamls
73 end 73 end
74 # opts.on('-e', '--examples STR1,STR2', Array, 'Run only these spec examples. Example: "should compile"') do |examples| 74 # 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
55 end 55 end
56 56
57 it 'should have inspect' do 57 it 'should have inspect' do
58 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]' 58 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]'
59 end 59 end
60 end 60 end
61 61
@@ -96,7 +96,7 @@ describe Noop::Task do
96 context 'facts' do 96 context 'facts' do
97 it 'has file_name_facts' do 97 it 'has file_name_facts' do
98 expect(subject.file_name_facts).to be_a Pathname 98 expect(subject.file_name_facts).to be_a Pathname
99 expect(subject.file_name_facts.to_s).to eq 'ubuntu14.yaml' 99 expect(subject.file_name_facts.to_s).to eq 'ubuntu16.yaml'
100 end 100 end
101 101
102 it 'can set file_name_facts' do 102 it 'can set file_name_facts' do
@@ -113,7 +113,7 @@ describe Noop::Task do
113 113
114 it 'has file_path_facts' do 114 it 'has file_path_facts' do
115 expect(subject.file_path_facts).to be_a Pathname 115 expect(subject.file_path_facts).to be_a Pathname
116 expect(subject.file_path_facts.to_s).to eq "#{root}/facts/ubuntu14.yaml" 116 expect(subject.file_path_facts.to_s).to eq "#{root}/facts/ubuntu16.yaml"
117 end 117 end
118 118
119 it 'has file_name_facts_override' do 119 it 'has file_name_facts_override' do