From 8803ba8c6c276c5e71b81f3d1a665f5ef13d7f88 Mon Sep 17 00:00:00 2001 From: Sebastien Badia Date: Mon, 30 Dec 2013 10:12:03 +0100 Subject: [PATCH] Remove site/params (privatecloud is a module now) --- params.pp | 231 ------------------------------------------------------ site.pp | 141 --------------------------------- 2 files changed, 372 deletions(-) delete mode 100644 params.pp delete mode 100644 site.pp diff --git a/params.pp b/params.pp deleted file mode 100644 index 4849c2d5..00000000 --- a/params.pp +++ /dev/null @@ -1,231 +0,0 @@ -# -# Copyright (C) 2013 eNovance SAS -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# Parameters of eNovance CI -# - -class os_params { - - if $::lxc_container { - $ip_range = '192.168.134' - $dns_ips = ["${ip_range}.1"] - } else { - $ip_range = '10.68.0' - $dns_ips = ["${ip_range}.2"] - } - - # General parameters - $compute = false - $debug = false - $install_packages = false - $os_release = 'havana' - $region = 'enovance-ci' - $site_domain = 'enovance.com' - $storage = true - $verbose = false - $spof_nodes_are_separated = false - - # Root hashed password - # ToDo(EmilienM): Disable root user in all nodes and use sudo - $root_password = '$1$2X/chMfy$CuJ4xPZY0WO2pRfIm5djn/' - - # OpenStack Identity - $identity_roles_addons = ['SwiftOperator', 'ResellerAdmin'] - $keystone_db_allowed_hosts = ['os-ci-test%', "${ip_range}.%"] - $keystone_db_host = "${ip_range}.57" - $keystone_db_password = 'H3YPSYaKbKP40DuvHHpdrhYFVpa10A' - $keystone_db_user = 'keystone' - $keystone_memcached = ["${ip_range}.57:11211"] - $ks_admin_email = 'dev@enovance.com' - $ks_admin_password = 'Xokoph5io2aenaoh0nuiquei9aineigo' - $ks_admin_tenant = 'admin' - $ks_admin_token = 'iw3feche3JeeYo9mejoohaugai3thohahwo9tiuyoe5Thier8Eiwah8K' - $ks_keystone_internal_host = 'os-ci-test13.enovance.com' - $ks_keystone_internal_port = '5000' - $ks_keystone_internal_proto = 'http' - $ks_keystone_admin_host = 'os-ci-test13.enovance.com' - $ks_keystone_admin_port = '35357' - $ks_keystone_admin_proto = 'http' - $ks_keystone_public_host = 'os-ci-test13.enovance.com' - $ks_keystone_public_port = '5000' - $ks_keystone_public_proto = 'http' - - # Swift - $ks_swift_internal_proto = 'http' - $ks_swift_admin_host = 'os-ci-test13.enovance.com' - $ks_swift_admin_port = '8080' - $ks_swift_admin_proto = 'http' - $ks_swift_dispersion_password = 'aipee1die1eeSohph9yae8eeluthaleu' - $ks_swift_internal_host = 'os-ci-test13.enovance.com' - $ks_swift_internal_port = '8080' - $ks_swift_password = 'cwnu6Eeph4jahsh5wooch5Panahjaidie8' - $ks_swift_public_host = 'os-ci-test13.enovance.com' - $ks_swift_public_port = '8080' - $ks_swift_public_proto = 'http' - $replicas = '3' - $statsd_host = '127.0.0.1' - $statsd_port = '4125' - $swift_cors_allow_origin = 'http://os-ci-test13.enovance.com' - $swift_hash_suffix = 'ni2aseiWi8ich3oo' - $swift_memchached = ["${ip_range}.57:11211"] - $swift_port = '8080' - $swift_rsync_max_connections = '5' - $os_swift_zone = { - 'os-ci-test8' => 1, - 'os-ci-test9' => 2, - 'os-ci-test12' => 3, - } - - # MySQL - $mysql_password = 'TRG33WDCAvmLqtUv5MwfGxDnxTyaciMAV4RFe044' - $mysql_debian_sys_maint = 'HFCeEKGG6DBQEaYUEDjGITcbzRWDmv' - $galera_master = 'os-ci-test13' - $galera_nextserver = { - 'os-ci-test13' => "${ip_range}.57", - 'os-ci-test12' => "${ip_range}.56", - 'os-ci-test11' => "${ip_range}.55" - } - - # LoadBalancer - $keepalived_email = "dev@${site_domain}" - $keepalived_smtp = "mxi1.${site_domain}" - $haproxy_auth = 'root:enovance' - - # Horizon - $horizon_port = '80' - $secret_key = 'fcDLLrpFMMxn1iBK8WiiqrY9yeGDvA' - - # RabbitMQ - $rabbit_names = ['os-ci-test13'] - $rabbit_hosts = ["${ip_range}.57:5672"] - $rabbit_password = 'okaeTh3aiwiewohk' - # Useful when we need a single Rabbit host (like Sensu needs) - $rabbit_main_host = 'os-ci-test13' - - - # Neutron - $external_int = 'eth1' - $ks_neutron_admin_host = 'os-ci-test13.enovance.com' - $ks_neutron_admin_port = '9696' - $ks_neutron_admin_proto = 'http' - $ks_neutron_internal_host = 'os-ci-test13.enovance.com' - $ks_neutron_internal_port = '9696' - $ks_neutron_internal_proto = 'http' - $ks_neutron_password = 'AJJTg2fSWrE4X4L1rhKJI74njLpFB0' - $ks_neutron_public_host = 'os-ci-test13.enovance.com' - $ks_neutron_public_port = '9696' - $ks_neutron_public_proto = 'http' - $neutron_db_allowed_hosts = ['os-ci-test%', "${ip_range}.%"] - $neutron_db_host = "${ip_range}.57" - $neutron_db_password = 'JCywR7Kt52Hi2hJTtpTb6LCGfo243x' - $neutron_db_user = 'neutron' - $neutron_port = '9696' - $tunnel_int = 'eth0' - - # Nova - $ks_nova_password = 'WeiveKed1Ahmel7ohfieya6daiquIe' - $nova_db_allowed_hosts = ['os-ci-test%', "${ip_range}.%"] - $nova_db_host = "${ip_range}.57" - $nova_db_password = 'Ae3tooch8shohNai9ooqueik9gaevo' - $nova_db_user = 'nova' - $nova_port = '8774' - $ks_nova_admin_host = 'os-ci-test13.enovance.com' - $ks_nova_admin_port = '8774' - $ks_nova_admin_proto = 'http' - $ks_nova_internal_host = 'os-ci-test13.enovance.com' - $ks_nova_internal_port = '8774' - $ks_nova_internal_proto = 'http' - $ks_nova_public_host = 'os-ci-test13.enovance.com' - $ks_nova_public_port = '8774' - $ks_ec2_public_port = '8773' - $ks_metadata_public_port = '8775' - $ks_nova_public_proto = 'http' - $neutron_metadata_proxy_shared_secret = 'k9i0t428P1AMxQ5X6a841psMJ' - $spice_port = '6082' - - # Glance - $glance_db_allowed_hosts = ['os-ci-test%', "${ip_range}.%"] - $glance_db_host = "${ip_range}.57" - $glance_db_password = 'uYgNjBzjMjv2fD0yD3LqiQQPKEKuXA' - $glance_db_user = 'glance' - $glance_port = '9292' - $ks_glance_admin_host = 'os-ci-test13.enovance.com' - $ks_glance_admin_port = '9292' - $ks_glance_admin_proto = 'http' - $ks_glance_internal_host = 'os-ci-test13.enovance.com' - $ks_glance_internal_port = '9292' - $ks_glance_internal_proto = 'http' - $ks_glance_public_host = 'os-ci-test13.enovance.com' - $ks_glance_public_port = '9292' - $ks_glance_public_proto = 'http' - $ks_glance_password = 'WUBDUbox7gDz3GP6EAYWGos9VBPh82' - - # Ceilometer - $ceilometer_database_connection = "mongodb://${ip_range}.57/ceilometer" - $ceilometer_secret = 'S45ILumu44rxn5u7spnbJws9XiWomc' - $ks_ceilometer_admin_host = 'os-ci-test13.enovance.com' - $ks_ceilometer_admin_port = '8777' - $ks_ceilometer_admin_proto = 'http' - $ks_ceilometer_internal_host = 'os-ci-test13.enovance.com' - $ks_ceilometer_internal_port = '8777' - $ks_ceilometer_internal_proto = 'http' - $ks_ceilometer_password = 'eafhafbheafaefaejiiutiu7374aesf3aiNu' - $ks_ceilometer_public_host = 'os-ci-test13.enovance.com' - $ks_ceilometer_public_port = '8777' - $ks_ceilometer_public_proto = 'http' - - # Cinder - $cinder_db_allowed_hosts = ['os-ci-test%', "${ip_range}.%"] - $cinder_db_host = "${ip_range}.57" - $cinder_db_password = 'BwgPjjqdbxiKvKm5JMaVrCaT8ePBwP' - $cinder_db_user = 'cinder' - $cinder_rbd_pool = 'cinder_volumes' - $cinder_rbd_secret_uuid = '95c98032-ad65-5db8-f5d3-5bd09cd563ef' - $cinder_rbd_user = 'cinder_rbd' - $glance_api_version = '2' - $ks_cinder_admin_host = 'os-ci-test13.enovance.com' - $ks_cinder_admin_port = '8776' - $ks_cinder_admin_proto = 'http' - $ks_cinder_internal_host = 'os-ci-test13.enovance.com' - $ks_cinder_internal_port = '8776' - $ks_cinder_internal_proto = 'http' - $ks_cinder_password = '768JIxDvnrBbwGaRRn5mHjrzz9jNJi' - $ks_cinder_public_host = 'os-ci-test13.enovance.com' - $ks_cinder_public_port = '8776' - $ks_cinder_public_proto = 'http' - - # Heat - $heat_db_allowed_hosts = ['os-ci-test%', "${ip_range}.%"] - $heat_db_host = "${ip_range}.57" - $heat_db_password = 'rooghah0phe1tieDeixoodo0quil8iox' - $heat_db_user = 'heat' - $ks_heat_admin_host = 'os-ci-test13.enovance.com' - $ks_heat_admin_port = '8004' - $ks_heat_cfn_admin_port = '8000' - $ks_heat_cloudwatch_admin_port = '8003' - $ks_heat_admin_proto = 'http' - $ks_heat_internal_host = 'os-ci-test13.enovance.com' - $ks_heat_internal_port = '8004' - $ks_heat_cfn_internal_port = '8000' - $ks_heat_cloudwatch_internal_port = '8003' - $ks_heat_internal_proto = 'http' - $ks_heat_password = 'EIMMvWvDPEvI08ggT2azYMhGdsNXe6' - $ks_heat_public_host = 'os-ci-test13.enovance.com' - $ks_heat_public_port = '8004' - $ks_heat_cfn_public_port = '8000' - $ks_heat_cloudwatch_public_port = '8003' - $ks_heat_public_proto = 'http' - -} diff --git a/site.pp b/site.pp deleted file mode 100644 index c8aedf0a..00000000 --- a/site.pp +++ /dev/null @@ -1,141 +0,0 @@ -# -# Copyright (C) 2013 eNovance SAS -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# site.pp -# - -import 'params.pp' - -# Import manifests -import 'manifests/*.pp' -import 'manifests/compute/*.pp' -import 'manifests/database/*.pp' -import 'manifests/monitoring/*.pp' -import 'manifests/network/*.pp' -import 'manifests/object-storage/*.pp' -import 'manifests/orchestration/*.pp' -import 'manifests/telemetry/*.pp' -import 'manifests/volume/*.pp' - -node common { - -# Params - class { 'os_params': } - -} - - -# Puppet Master node (x1) -node 'os-ci-test4', /pmaster\d+.enovance.com/ inherits common{ - -# Everything related to puppet is bootstraped by jenkins -# and other stuffs are made by common class. - -} - -# Controller nodes (x3) -node 'os-ci-test13', 'os-ci-test12', 'os-ci-test11', /mgmt\d+.enovance.com/ inherits common { - -# os-ci-test13 is the main mgmt - -## Load-Balancer: - class {'privatecloud::loadbalancer':} - -## Databases: - class {'privatecloud::database::sql':} - class {'privatecloud::database::nosql':} - -## Dashboard: - class {'privatecloud::dashboard':} - -## Compute: - class {'privatecloud::compute::controller':} - -## Image: - class {'privatecloud::image':} - -## Telemetry - class {'os_telemetry_common':} - class {'os_telemetry_server':} - -## SPOF services - class {'privatecloud::spof':} - -## Identity - class {'privatecloud::identity': - local_ip => $ipaddress_eth0, - } - -# Object Storage - class {'os_swift_proxy': } - class {'os_swift_ringbuilder': - rsyncd_ipaddress => $ipaddress_eth0, - } - Class['os_swift_ringbuilder'] -> Class['os_swift_proxy'] - -# Messaging - class {'privatecloud::messaging': } - -# Cache - class {'privatecloud::cache': } - -# Networking - class {'privatecloud::network::controller': } - -# Orchestration - class {'os_orchestration_common': } - class {'os_orchestration_api': } - -} -# -# == Network nodes (x2) -# L2 integration providing several services: DHCP, L3 Agent, Metadata service, LBaaS, and VPNaaS -# We need at least two nodes for DHCP High availability -node 'os-ci-test8', /net\d+.enovance.com/ inherits common { - - class {'privatecloud::network::dhcp': } - class {'privatecloud::network::metadata': } - class {'privatecloud::network::lbaas': } - class {'privatecloud::network::l3': } - class {'privatecloud::network::vpn':} - -} - -# Storage nodes (x3) -node /storage\d+.enocloud.com/ inherits common{ - -## Telemetry - class {'os_telemetry_common':} - -## Object Storage - class { 'os_swift_storage': - local_ip => $ipaddress_eth0, - swift_zone => $os_params::os_swift_zone[$::hostname], - } -} - -# Compute nodes (x1) -node 'os-ci-test10', /compute\d+.enovance.com/ inherits common { - -## Networking - class { 'os_network_common': } - class { 'os_network_compute': } - -## Compute - class { 'privatecloud::compute::hypervisor': - local_ip => $ipaddress_eth0, - } - -}