From cfcbf3d8a0bb60fee85fdb465510a79c4e30e3a0 Mon Sep 17 00:00:00 2001
From: Tony Breeds <tony@bakeyournoodle.com>
Date: Wed, 29 Nov 2017 08:44:57 +1100
Subject: [PATCH] Add ComputeAlt role and environment

In order to support compute services ppc64le, which currently don't
have supported methods for building and distributing container images,
we create a role 'ComputeAlt' which directly uses the puppet/services
templates to configure services that would typically be containers.

This new role is supposed to minimally diverge from the Compute role

The following services have been switch for the puppet versions:
 - OS::TripleO::Services::ComputeCeilometerAgent
 - OS::TripleO::Services::ComputeNeutronOvsAgent
 - OS::TripleO::Services::Iscsid
 - OS::TripleO::Services::NovaCompute
 - OS::TripleO::Services::NovaLibvirt
 - OS::TripleO::Services::NovaMigrationTarget

The following services have been removed as they're only available as
docker containers:
 - OS::TripleO::Services::Docker
 - OS::TripleO::Services::ContainersLogrotateCrond
 - OS::TripleO::Services::RsyslogSidecar

Alternate versions for the following services are configured, they are
left as OS::Heat::None the operator will need to define them
appropriately if they're needed:
 - OS::TripleO::Services::Collectd
 - OS::TripleO::Services::Fluentd
 - OS::TripleO::Services::SensuClient
 - OS::TripleO::Services::OVNController

Change-Id: I31d673dd048f687c9125733a77d0c9e6069e0614
---
 environments/computealt.yaml | 19 ++++++++++++++
 roles/ComputeAlt.yaml        | 49 ++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 environments/computealt.yaml
 create mode 100644 roles/ComputeAlt.yaml

diff --git a/environments/computealt.yaml b/environments/computealt.yaml
new file mode 100644
index 0000000000..960a695935
--- /dev/null
+++ b/environments/computealt.yaml
@@ -0,0 +1,19 @@
+resource_registry:
+  OS::TripleO::Services::CollectdAlt: OS::Heat::None
+  # If enabling collectd you'll need provide the following in a specific resource_registry
+  # OS::TripleO::Services::CollectdAlt: ../puppet/services/metrics/collectd.yaml
+  OS::TripleO::Services::ComputeCeilometerAgentAlt: ../puppet/services/ceilometer-agent-compute.yaml
+  OS::TripleO::Services::ComputeNeutronOvsAgentAlt: ../puppet/services/neutron-ovs-agent.yaml
+  OS::TripleO::Services::FluentdAlt: OS::Heat::None
+  # If enabling fluentd you'll need provide the following in a specific resource_registry
+  # OS::TripleO::Services::FluentdAlt: ../puppet/services/logging/fluentd.yaml
+  OS::TripleO::Services::IscsidAlt: ../puppet/services/iscsid.yaml
+  OS::TripleO::Services::NovaComputeAlt: ../puppet/services/nova-compute.yaml
+  OS::TripleO::Services::NovaLibvirtAlt: ../puppet/services/nova-libvirt.yaml
+  OS::TripleO::Services::NovaMigrationTargetAlt: ../puppet/services/nova-migration-target.yaml
+  OS::TripleO::Services::SensuClientAlt: OS::Heat::None
+  # If enabling monitoring you'll need provide the following in a specific resource_registry
+  # OS::TripleO::Services::SensuClientAlt: ../puppet/services/monitoring/sensu-client.yaml
+  OS::TripleO::Services::OVNControllerAlt: OS::Heat::None
+  # If enabling OVN you'll need provide the following in a specific resource_registry
+  # OS::TripleO::Services::OVNControllerAlt: ../puppet/services/ovn-controller.yaml
diff --git a/roles/ComputeAlt.yaml b/roles/ComputeAlt.yaml
new file mode 100644
index 0000000000..a901347fcd
--- /dev/null
+++ b/roles/ComputeAlt.yaml
@@ -0,0 +1,49 @@
+###############################################################################
+# Role: ComputeAlt                                                            #
+###############################################################################
+- name: ComputeAlt
+  description: |
+   Alternate Compute Node role
+  CountDefault: 0
+  networks:
+    - InternalApi
+    - Tenant
+    - Storage
+  HostnameFormatDefault: '%stackname%-novacomputealt-%index%'
+  disable_upgrade_deployment: True
+  disable_constraints: True
+  ServicesDefault:
+    - OS::TripleO::Services::AuditD
+    - OS::TripleO::Services::CACerts
+    - OS::TripleO::Services::CephClient
+    - OS::TripleO::Services::CephExternal
+    - OS::TripleO::Services::CertmongerUser
+    - OS::TripleO::Services::CollectdAlt
+    - OS::TripleO::Services::ComputeCeilometerAgentAlt
+    - OS::TripleO::Services::ComputeNeutronCorePlugin
+    - OS::TripleO::Services::ComputeNeutronL3Agent
+    - OS::TripleO::Services::ComputeNeutronMetadataAgent
+    - OS::TripleO::Services::ComputeNeutronOvsAgentAlt
+    - OS::TripleO::Services::FluentdAlt
+    - OS::TripleO::Services::IscsidAlt
+    - OS::TripleO::Services::Kernel
+    - OS::TripleO::Services::MySQLClient
+    - OS::TripleO::Services::NeutronBgpVpnBagpipe
+    - OS::TripleO::Services::NeutronLinuxbridgeAgent
+    - OS::TripleO::Services::NeutronVppAgent
+    - OS::TripleO::Services::NovaComputeAlt
+    - OS::TripleO::Services::NovaLibvirtAlt
+    - OS::TripleO::Services::NovaMigrationTargetAlt
+    - OS::TripleO::Services::Ntp
+    - OS::TripleO::Services::OpenDaylightOvs
+    - OS::TripleO::Services::Securetty
+    - OS::TripleO::Services::SensuClientAlt
+    - OS::TripleO::Services::SkydiveAgent
+    - OS::TripleO::Services::Snmp
+    - OS::TripleO::Services::Sshd
+    - OS::TripleO::Services::Timezone
+    - OS::TripleO::Services::TripleoFirewall
+    - OS::TripleO::Services::TripleoPackages
+    - OS::TripleO::Services::Tuned
+    - OS::TripleO::Services::Vpp
+    - OS::TripleO::Services::OVNControllerAlt