Enable nova-consoleauth as a composable service

Implement NovaConsoleauth service using nova-base for common
meters.

Depends-On: I955b4fc07dc07d8adc32411848e3e131d77a5123
Implements: blueprint composable-services-within-roles
Change-Id: I7248f9c0a7a575675a2c2551ca9f8f51290a6656

8 files changed, 57 insertions, 10 deletions

diff --git a/environments/puppet-pacemaker.yaml b/environments/puppet-pacemaker.yaml
index 131a8b89..2385646f 100644
--- a/environments/puppet-pacemaker.yaml
+++ b/environments/puppet-pacemaker.yaml
@@ -33,3 +33,4 @@ resource_registry:
   OS::TripleO::Services::MongoDb: ../puppet/services/pacemaker/database/mongodb.yaml
   OS::TripleO::Services::NovaApi: ../puppet/services/pacemaker/nova-api.yaml
   OS::TripleO::Services::NovaScheduler: ../puppet/services/pacemaker/nova-scheduler.yaml
+  OS::TripleO::Services::NovaConsoleauth: ../puppet/services/pacemaker/nova-consoleauth.yaml
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml
index 9e662324..8ba7ccd0 100644
--- a/overcloud-resource-registry-puppet.yaml
+++ b/overcloud-resource-registry-puppet.yaml
@@ -150,6 +150,7 @@ resource_registry:
   OS::TripleO::Services::MongoDb: puppet/services/database/mongodb.yaml
   OS::TripleO::Services::NovaApi: puppet/services/nova-api.yaml
   OS::TripleO::Services::NovaScheduler: puppet/services/nova-scheduler.yaml
+  OS::TripleO::Services::NovaConsoleauth: puppet/services/nova-consoleauth.yaml
 
 parameter_defaults:
   EnablePackageInstall: false
diff --git a/overcloud.yaml b/overcloud.yaml
index 45571b95..d0a43451 100644
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -592,6 +592,7 @@ parameters:
       - OS::TripleO::Services::MongoDb
       - OS::TripleO::Services::NovaApi
       - OS::TripleO::Services::NovaScheduler
+      - OS::TripleO::Services::NovaConsoleauth
     description: A list of service resources (configured in the Heat
                  resource_registry) which represent nested stacks
                  for each service that should get installed on the Controllers.
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 7724f17c..e69656cf 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -1,7 +1,6 @@
 # Hiera data here applies to all controller nodes
 
 nova::api::enabled: true
-nova::consoleauth::enabled: true
 nova::vncproxy::enabled: true
 
 # gnocchi
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 366f98cf..86ad3c50 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -151,7 +151,6 @@ if hiera('step') >= 4 {
     memcached_servers => $memcached_servers
   }
   include ::nova::config
-  include ::nova::consoleauth
   include ::nova::network::neutron
   include ::nova::vncproxy
 
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 9162f937..4084e734 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -350,10 +350,6 @@ MYSQL_HOST=localhost\n",
 
   include ::nova::config
 
-  class { '::nova::consoleauth' :
-    manage_service => false,
-    enabled        => false,
-  }
   class { '::nova::vncproxy' :
     manage_service => false,
     enabled        => false,
@@ -704,10 +700,6 @@ password=\"${mysql_root_password}\"",
     }
 
     # Nova
-    pacemaker::resource::service { $::nova::params::consoleauth_service_name :
-      clone_params => 'interleave=true',
-      require      => Pacemaker::Resource::Ocf['openstack-core'],
-    }
     pacemaker::resource::service { $::nova::params::vncproxy_service_name :
       clone_params => 'interleave=true',
     }
diff --git a/puppet/services/nova-consoleauth.yaml b/puppet/services/nova-consoleauth.yaml
new file mode 100644
index 00000000..791c5449
--- /dev/null
+++ b/puppet/services/nova-consoleauth.yaml
@@ -0,0 +1,24 @@
+heat_template_version: 2016-04-08
+
+description: >
+  OpenStack Nova Consoleauth service configured with Puppet
+
+parameters:
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
+
+resources:
+  NovaBase:
+    type: ./nova-base.yaml
+
+outputs:
+  role_data:
+    description: Role data for the Nova Consoleauth service.
+    value:
+      config_settings:
+        get_attr: [NovaBase, role_data, config_settings]
+      step_config: |
+        include tripleo::profile::base::nova::consoleauth
diff --git a/puppet/services/pacemaker/nova-consoleauth.yaml b/puppet/services/pacemaker/nova-consoleauth.yaml
new file mode 100644
index 00000000..f9b6b058
--- /dev/null
+++ b/puppet/services/pacemaker/nova-consoleauth.yaml
@@ -0,0 +1,30 @@
+heat_template_version: 2016-04-08
+
+description: >
+  OpenStack Nova Consoleauth service with Pacemaker configured with Puppet.
+
+parameters:
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
+
+resources:
+
+  NovaConsoleauthBase:
+    type: ../nova-consoleauth.yaml
+    properties:
+      EndpointMap: {get_param: EndpointMap}
+
+outputs:
+  role_data:
+    description: Role data for the Nova Consoleauth role.
+    value:
+      config_settings:
+        map_merge:
+          - get_attr: [NovaConsoleauthBase, role_data, config_settings]
+          - nova::consoleauth::manage_service: false
+            nova::consoleauth::enabled: false
+      step_config: |
+        include ::tripleo::profile::pacemaker::nova::consoleauth