Merge "Add ComputeAlt role and environment"

2017-11-30 03:12:13 +00:00 · 2017-11-30 03:12:13 +00:00 · 4df242c301
parent b2b02a89f7 cfcbf3d8a0
commit 4df242c301
2 changed files with 68 additions and 0 deletions
--- a/environments/computealt.yaml
+++ 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
--- a/roles/ComputeAlt.yaml
+++ 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