From bf128bed503679115248ac2f9046da0c2f03ab27 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Thu, 12 Dec 2013 13:28:23 +0100 Subject: [PATCH] Cleanup all headers Signed-off-by: Emilien Macchi --- README | 7 +------ cloudinit/user-data | 13 ------------- params.pp | 4 ---- roles/automation/puppet-master.pp | 2 -- roles/cache/cache_server.pp | 2 -- roles/common/authorized_keys.pp | 4 ---- roles/common/system.pp | 2 -- roles/compute/compute_common.pp | 5 ----- roles/compute/compute_controller.pp | 2 -- roles/compute/compute_hypervisor.pp | 4 ---- roles/dashboard/dashboard.pp | 6 +----- roles/database/nosql_node.pp | 2 -- roles/database/sql_node.pp | 5 ----- roles/identity/identity-controller.pp | 7 +++---- roles/image/image_controller.pp | 7 ------- roles/load-balancer/lb_server.pp | 4 ---- roles/messaging/messaging_server.pp | 4 ---- roles/network/network_common.pp | 2 -- roles/network/network_compute.pp | 4 ---- roles/network/network_controller.pp | 4 ---- roles/network/network_dhcp.pp | 2 -- roles/network/network_l3.pp | 2 -- roles/network/network_lbaas.pp | 2 -- roles/network/network_metadata.pp | 2 -- roles/network/network_vpn.pp | 2 -- roles/object-storage/swift_common.pp | 4 ---- roles/object-storage/swift_proxy.pp | 4 ---- roles/object-storage/swift_ringbuiler.pp | 4 ---- roles/object-storage/swift_storage.pp | 4 ---- roles/object-storage/swift_tweaking.pp | 8 +++----- roles/orchestration/orchestration_controller.pp | 3 --- roles/telemetry/telemetry_common.pp | 4 ---- roles/telemetry/telemetry_server.pp | 4 ---- roles/volume/volume_common.pp | 2 -- roles/volume/volume_controller.pp | 5 ----- roles/volume/volume_storage.pp | 2 -- site.pp | 4 ---- 37 files changed, 8 insertions(+), 140 deletions(-) delete mode 100644 cloudinit/user-data diff --git a/README b/README index 8fd83b69..62585e0d 100644 --- a/README +++ b/README @@ -1,8 +1,3 @@ -Run OpenStack in eNovance CI using puppet manifests. - +Part of eNovance Private Cloud v1.0 Support: dev@enovance.com - -#TODO/#FIXME -- factorize memcached -- use puppet-horizon ? diff --git a/cloudinit/user-data b/cloudinit/user-data deleted file mode 100644 index 223030dd..00000000 --- a/cloudinit/user-data +++ /dev/null @@ -1,13 +0,0 @@ -#cloud-config -runcmd: - - groupadd cloud-users - - useradd -m -c "eNovance Jenkins User" -g cloud-users -s /bin/bash jenkins - - echo "jenkins ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers - - mkdir -p /home/jenkins/.ssh - - echo ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDlfCjJqwyI/xb5TU3ksbsvzFcEXeYNUnhhlve3JXAKebF/fJ4qarZ7yCVXrlakSiK1blF4QJTROlRLOAF+A0dRdyRuTCMFZCA4lVEjgHMgh8uwszta+d1PYIXGcTGKGLKDWQRHQNfN9l431NOxWEAE9ng5PRYX9bxl6FxRNdrM4So3+zF9rwLt6Ad+J8RuBAuhYKHTTQ5IdtM91d+/jGf12n1JHUy2XPcQKDpW7IbAjcX4qLx5of7WasM8Yt57+k5jxsfs0T9UsrXZ7jqaidv6PDNH550kIeaLF+hvEEgP1eC36ac52HUI7SVQu5/eYcR6zSEHbYRMm5xQvfDO5qJP techs@enovance.com >> /home/jenkins/.ssh/authorized_keys - -puppet: - conf: - agent: - server: "os-ci-test2.enovance.com" - certname: "%i.%f" diff --git a/params.pp b/params.pp index 4b20231b..9feff804 100644 --- a/params.pp +++ b/params.pp @@ -1,10 +1,6 @@ # # Copyright (C) 2013 eNovance SAS # -# Authors: Mehdi Abaakouk -# Emilien Macchi -# Francois Charlier -# # 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 diff --git a/roles/automation/puppet-master.pp b/roles/automation/puppet-master.pp index 79028a0d..bfc43a30 100644 --- a/roles/automation/puppet-master.pp +++ b/roles/automation/puppet-master.pp @@ -1,8 +1,6 @@ # # Copyright (C) 2013 eNovance SAS # -# Authors: Emilien Macchi -# # 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 diff --git a/roles/cache/cache_server.pp b/roles/cache/cache_server.pp index d030e4d4..d0a1f7c0 100644 --- a/roles/cache/cache_server.pp +++ b/roles/cache/cache_server.pp @@ -1,8 +1,6 @@ # # Copyright (C) 2013 eNovance SAS # -# Authors: Emilien Macchi -# # 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 diff --git a/roles/common/authorized_keys.pp b/roles/common/authorized_keys.pp index 0cce8d2c..e8f5443a 100644 --- a/roles/common/authorized_keys.pp +++ b/roles/common/authorized_keys.pp @@ -1,10 +1,6 @@ # # Copyright (C) 2013 eNovance SAS # -# Authors: Mehdi Abaakouk -# Emilien Macchi -# Francois Charlier -# # 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 diff --git a/roles/common/system.pp b/roles/common/system.pp index 7a52168e..c31714a7 100644 --- a/roles/common/system.pp +++ b/roles/common/system.pp @@ -1,8 +1,6 @@ # # Copyright (C) 2013 eNovance SAS # -# Authors: Emilien Macchi -# # 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 diff --git a/roles/compute/compute_common.pp b/roles/compute/compute_common.pp index f3868fc7..99c2d654 100644 --- a/roles/compute/compute_common.pp +++ b/roles/compute/compute_common.pp @@ -1,11 +1,6 @@ # # Copyright (C) 2013 eNovance SAS # -# Authors: Mehdi Abaakouk -# Emilien Macchi -# Francois Charlier -# Sebastien Badia -# # 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 diff --git a/roles/compute/compute_controller.pp b/roles/compute/compute_controller.pp index e2d4ba55..2658d5e4 100644 --- a/roles/compute/compute_controller.pp +++ b/roles/compute/compute_controller.pp @@ -1,8 +1,6 @@ # # Copyright (C) 2013 eNovance SAS # -# Author: Emilien Macchi -# # 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 diff --git a/roles/compute/compute_hypervisor.pp b/roles/compute/compute_hypervisor.pp index 6e82632e..dee54707 100644 --- a/roles/compute/compute_hypervisor.pp +++ b/roles/compute/compute_hypervisor.pp @@ -1,10 +1,6 @@ # # Copyright (C) 2013 eNovance SAS # -# Authors: Mehdi Abaakouk -# Emilien Macchi -# Francois Charlier -# # 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 diff --git a/roles/dashboard/dashboard.pp b/roles/dashboard/dashboard.pp index 376398d5..a3765b67 100644 --- a/roles/dashboard/dashboard.pp +++ b/roles/dashboard/dashboard.pp @@ -1,11 +1,6 @@ # # Copyright (C) 2013 eNovance SAS # -# Authors: Mehdi Abaakouk -# Emilien Macchi -# Francois Charlier -# Sebastien Badia -# # 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 @@ -19,6 +14,7 @@ # under the License. # # Horizon dashboard +# class os_dashboard( $ks_keystone_internal_host = $os_params::ks_keystone_internal_host, diff --git a/roles/database/nosql_node.pp b/roles/database/nosql_node.pp index 3b80036c..2040ecbb 100644 --- a/roles/database/nosql_node.pp +++ b/roles/database/nosql_node.pp @@ -1,8 +1,6 @@ # # Copyright (C) 2013 eNovance SAS # -# Author: Emilien Macchi -# # 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 diff --git a/roles/database/sql_node.pp b/roles/database/sql_node.pp index 3e41b151..42f8c66c 100644 --- a/roles/database/sql_node.pp +++ b/roles/database/sql_node.pp @@ -1,11 +1,6 @@ # # Copyright (C) 2013 eNovance SAS # -# Authors: Mehdi Abaakouk -# Emilien Macchi -# Francois Charlier -# Dimitri Savineau (MySQL Optimization) -# # 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 diff --git a/roles/identity/identity-controller.pp b/roles/identity/identity-controller.pp index 28c2c907..b2b3f310 100644 --- a/roles/identity/identity-controller.pp +++ b/roles/identity/identity-controller.pp @@ -1,10 +1,6 @@ # # Copyright (C) 2013 eNovance SAS # -# Authors: Mehdi Abaakouk -# Emilien Macchi -# Francois Charlier -# # 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 @@ -16,6 +12,9 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. +# +# Identity controller +# class os_identity_controller ( $identity_roles_addons = $os_params::identity_roles_addons, diff --git a/roles/image/image_controller.pp b/roles/image/image_controller.pp index 01ff0f0e..05e43893 100644 --- a/roles/image/image_controller.pp +++ b/roles/image/image_controller.pp @@ -1,11 +1,6 @@ # # Copyright (C) 2013 eNovance SAS # -# Authors: Mehdi Abaakouk -# Emilien Macchi -# Francois Charlier -# Sebastien Badia -# # 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 @@ -20,8 +15,6 @@ # # Image controller # -# Class:: os_image_controller -# class os_image_controller( $glance_db_user = $os_params::glance_db_user, diff --git a/roles/load-balancer/lb_server.pp b/roles/load-balancer/lb_server.pp index bbc3727a..bb4df492 100644 --- a/roles/load-balancer/lb_server.pp +++ b/roles/load-balancer/lb_server.pp @@ -1,10 +1,6 @@ # # Copyright (C) 2013 eNovance SAS # -# Authors: Mehdi Abaakouk -# Emilien Macchi -# Francois Charlier -# # 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 diff --git a/roles/messaging/messaging_server.pp b/roles/messaging/messaging_server.pp index a112d87a..fdba577b 100644 --- a/roles/messaging/messaging_server.pp +++ b/roles/messaging/messaging_server.pp @@ -1,10 +1,6 @@ # # Copyright (C) 2013 eNovance SAS # -# Authors: Mehdi Abaakouk -# Emilien Macchi -# Francois Charlier -# # 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 diff --git a/roles/network/network_common.pp b/roles/network/network_common.pp index 61b449c6..aaa03a1a 100644 --- a/roles/network/network_common.pp +++ b/roles/network/network_common.pp @@ -1,8 +1,6 @@ # # Copyright (C) 2013 eNovance SAS # -# Author: Emilien Macchi -# # 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 diff --git a/roles/network/network_compute.pp b/roles/network/network_compute.pp index 4ea11eb1..65b4b9a2 100644 --- a/roles/network/network_compute.pp +++ b/roles/network/network_compute.pp @@ -1,10 +1,6 @@ # # Copyright (C) 2013 eNovance SAS # -# Authors: Mehdi Abaakouk -# Emilien Macchi -# Francois Charlier -# # 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 diff --git a/roles/network/network_controller.pp b/roles/network/network_controller.pp index 6edbea3c..9c9befd3 100644 --- a/roles/network/network_controller.pp +++ b/roles/network/network_controller.pp @@ -1,10 +1,6 @@ # # Copyright (C) 2013 eNovance SAS # -# Authors: Mehdi Abaakouk -# Emilien Macchi -# Francois Charlier -# # 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 diff --git a/roles/network/network_dhcp.pp b/roles/network/network_dhcp.pp index 91c78255..da3a5482 100644 --- a/roles/network/network_dhcp.pp +++ b/roles/network/network_dhcp.pp @@ -1,8 +1,6 @@ # # Copyright (C) 2013 eNovance SAS # -# Author: Emilien Macchi -# # 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 diff --git a/roles/network/network_l3.pp b/roles/network/network_l3.pp index 78cf8b99..d677f9a5 100644 --- a/roles/network/network_l3.pp +++ b/roles/network/network_l3.pp @@ -1,8 +1,6 @@ # # Copyright (C) 2013 eNovance SAS # -# Author: Emilien Macchi -# # 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 diff --git a/roles/network/network_lbaas.pp b/roles/network/network_lbaas.pp index dda4851a..0b658ce3 100644 --- a/roles/network/network_lbaas.pp +++ b/roles/network/network_lbaas.pp @@ -1,8 +1,6 @@ # # Copyright (C) 2013 eNovance SAS # -# Author: Emilien Macchi -# # 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 diff --git a/roles/network/network_metadata.pp b/roles/network/network_metadata.pp index e21f7746..e6383d51 100644 --- a/roles/network/network_metadata.pp +++ b/roles/network/network_metadata.pp @@ -1,8 +1,6 @@ # # Copyright (C) 2013 eNovance SAS # -# Author: Emilien Macchi -# # 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 diff --git a/roles/network/network_vpn.pp b/roles/network/network_vpn.pp index f3600c05..bd8b4d80 100644 --- a/roles/network/network_vpn.pp +++ b/roles/network/network_vpn.pp @@ -1,8 +1,6 @@ # # Copyright (C) 2013 eNovance SAS # -# Author: Emilien Macchi -# # 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 diff --git a/roles/object-storage/swift_common.pp b/roles/object-storage/swift_common.pp index c26a114d..166805e4 100644 --- a/roles/object-storage/swift_common.pp +++ b/roles/object-storage/swift_common.pp @@ -1,10 +1,6 @@ # # Copyright (C) 2013 eNovance SAS # -# Authors: Mehdi Abaakouk -# Emilien Macchi -# Francois Charlier -# # 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 diff --git a/roles/object-storage/swift_proxy.pp b/roles/object-storage/swift_proxy.pp index 9c504bb5..1697e74d 100644 --- a/roles/object-storage/swift_proxy.pp +++ b/roles/object-storage/swift_proxy.pp @@ -1,10 +1,6 @@ # # Copyright (C) 2013 eNovance SAS # -# Authors: Mehdi Abaakouk -# Emilien Macchi -# Francois Charlier -# # 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 diff --git a/roles/object-storage/swift_ringbuiler.pp b/roles/object-storage/swift_ringbuiler.pp index fc37f039..7e7a9ddc 100644 --- a/roles/object-storage/swift_ringbuiler.pp +++ b/roles/object-storage/swift_ringbuiler.pp @@ -1,10 +1,6 @@ # # Copyright (C) 2013 eNovance SAS # -# Authors: Mehdi Abaakouk -# Emilien Macchi -# Francois Charlier -# # 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 diff --git a/roles/object-storage/swift_storage.pp b/roles/object-storage/swift_storage.pp index 4b149f2e..ecdc05f7 100644 --- a/roles/object-storage/swift_storage.pp +++ b/roles/object-storage/swift_storage.pp @@ -1,10 +1,6 @@ # # Copyright (C) 2013 eNovance SAS # -# Authors: Mehdi Abaakouk -# Emilien Macchi -# Francois Charlier -# # 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 diff --git a/roles/object-storage/swift_tweaking.pp b/roles/object-storage/swift_tweaking.pp index 7195c4e4..8908be4c 100644 --- a/roles/object-storage/swift_tweaking.pp +++ b/roles/object-storage/swift_tweaking.pp @@ -1,10 +1,6 @@ # # Copyright (C) 2013 eNovance SAS # -# Authors: Mehdi Abaakouk -# Emilien Macchi -# Francois Charlier -# # 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 @@ -17,7 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. # -# swift tweaking +# Swift tweaking +# + class os_swift_system::tweaking { file {'/etc/sysctl.d/swift-tuning.conf': content => " diff --git a/roles/orchestration/orchestration_controller.pp b/roles/orchestration/orchestration_controller.pp index 24120864..fddbdb6d 100644 --- a/roles/orchestration/orchestration_controller.pp +++ b/roles/orchestration/orchestration_controller.pp @@ -1,9 +1,6 @@ # # Copyright (C) 2013 eNovance SAS # -# Authors: Sebastien Badia -# Emilien Macchi -# # 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 diff --git a/roles/telemetry/telemetry_common.pp b/roles/telemetry/telemetry_common.pp index ae916c7f..4e5e30b1 100644 --- a/roles/telemetry/telemetry_common.pp +++ b/roles/telemetry/telemetry_common.pp @@ -1,10 +1,6 @@ # # Copyright (C) 2013 eNovance SAS # -# Authors: Mehdi Abaakouk -# Emilien Macchi -# Francois Charlier -# # 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 diff --git a/roles/telemetry/telemetry_server.pp b/roles/telemetry/telemetry_server.pp index 08495f6b..5abf6b2d 100644 --- a/roles/telemetry/telemetry_server.pp +++ b/roles/telemetry/telemetry_server.pp @@ -1,10 +1,6 @@ # # Copyright (C) 2013 eNovance SAS # -# Authors: Mehdi Abaakouk -# Emilien Macchi -# Francois Charlier -# # 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 diff --git a/roles/volume/volume_common.pp b/roles/volume/volume_common.pp index fa06ae75..5d5d3ad4 100644 --- a/roles/volume/volume_common.pp +++ b/roles/volume/volume_common.pp @@ -1,8 +1,6 @@ # # Copyright (C) 2013 eNovance SAS # -# Author: Emilien Macchi -# # 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 diff --git a/roles/volume/volume_controller.pp b/roles/volume/volume_controller.pp index b4425719..a71a4d7c 100644 --- a/roles/volume/volume_controller.pp +++ b/roles/volume/volume_controller.pp @@ -1,11 +1,6 @@ # # Copyright (C) 2013 eNovance SAS # -# Authors: Mehdi Abaakouk -# Emilien Macchi -# Francois Charlier -# Sebastien Badia -# # 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 diff --git a/roles/volume/volume_storage.pp b/roles/volume/volume_storage.pp index 85a131a0..52f42969 100644 --- a/roles/volume/volume_storage.pp +++ b/roles/volume/volume_storage.pp @@ -1,8 +1,6 @@ # # Copyright (C) 2013 eNovance SAS # -# Author: Emilien Macchi -# # 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 diff --git a/site.pp b/site.pp index 63acc702..948032ac 100644 --- a/site.pp +++ b/site.pp @@ -1,10 +1,6 @@ # # Copyright (C) 2013 eNovance SAS # -# Authors: Mehdi Abaakouk -# Emilien Macchi -# Francois Charlier -# # 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