From 58c824dd2cf81e7a67bd0c48620dc962e7487d86 Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Tue, 28 Jul 2015 09:46:24 +0200 Subject: [PATCH] Support for the Opencontrail controller This commit aims to add the neccesary puppet bits so one can deploy an opencontrail controller. The puppet-contrail modules aims to configure all aspects of contrail on both controller and vrouter. The puppet-cassandra, puppet-kafka and puppet-zookeeper modules are here in order to configure properly the respective databases on which Opencontrail controller relies. Change-Id: I1b0f5b4ae4a892c687007e79e3ffd60851552879 Depends-On: I7455c71ca8747ee05b5a87362e2bd6a5527f86c8 --- elements/overcloud-contrail-controller/README.md | 1 + elements/overcloud-contrail-controller/element-deps | 2 ++ .../package-installs-overcloud-contrail-controller | 5 +++++ elements/overcloud-contrail-controller/pkg-map | 9 +++++++++ .../environment.d/01-puppet-modules-install-types.sh | 4 ++++ elements/puppet-modules/source-repository-puppet-modules | 4 ++++ 6 files changed, 25 insertions(+) create mode 100644 elements/overcloud-contrail-controller/README.md create mode 100644 elements/overcloud-contrail-controller/element-deps create mode 100644 elements/overcloud-contrail-controller/install.d/package-installs-overcloud-contrail-controller create mode 100644 elements/overcloud-contrail-controller/pkg-map diff --git a/elements/overcloud-contrail-controller/README.md b/elements/overcloud-contrail-controller/README.md new file mode 100644 index 00000000..b8f2e7db --- /dev/null +++ b/elements/overcloud-contrail-controller/README.md @@ -0,0 +1 @@ +Install all packages required for the overcloud contrail controller role. diff --git a/elements/overcloud-contrail-controller/element-deps b/elements/overcloud-contrail-controller/element-deps new file mode 100644 index 00000000..73015c24 --- /dev/null +++ b/elements/overcloud-contrail-controller/element-deps @@ -0,0 +1,2 @@ +package-installs +pkg-map diff --git a/elements/overcloud-contrail-controller/install.d/package-installs-overcloud-contrail-controller b/elements/overcloud-contrail-controller/install.d/package-installs-overcloud-contrail-controller new file mode 100644 index 00000000..453ce891 --- /dev/null +++ b/elements/overcloud-contrail-controller/install.d/package-installs-overcloud-contrail-controller @@ -0,0 +1,5 @@ +contrail_analytics_package +contrail_config_package +contrail_control_package +contrail_database_package +contrail_webui_package diff --git a/elements/overcloud-contrail-controller/pkg-map b/elements/overcloud-contrail-controller/pkg-map new file mode 100644 index 00000000..38b02ff5 --- /dev/null +++ b/elements/overcloud-contrail-controller/pkg-map @@ -0,0 +1,9 @@ +{ + "default": { + "contrail_analytics_package": "contrail-openstack-analytics", + "contrail_config_package": "contrail-openstack-config", + "contrail_control_package": "contrail-openstack-control", + "contrail_database_package": "contrail-openstack-database", + "contrail_webui_package": "contrail-openstack-webui" + } +} diff --git a/elements/puppet-modules/environment.d/01-puppet-modules-install-types.sh b/elements/puppet-modules/environment.d/01-puppet-modules-install-types.sh index 281ebb54..f84bd261 100644 --- a/elements/puppet-modules/environment.d/01-puppet-modules-install-types.sh +++ b/elements/puppet-modules/environment.d/01-puppet-modules-install-types.sh @@ -3,11 +3,13 @@ DIB_INSTALLTYPE_puppet_modules=${DIB_INSTALLTYPE_puppet_modules:-"source"} if [ "$DIB_INSTALLTYPE_puppet_modules" = "source" ]; then for module_name in \ puppetlabs-apache \ + puppet-cassandra \ puppet-ceph \ puppet-ceilometer \ puppet-certmonger \ puppet-cinder \ puppet-common \ + puppet-contrail \ puppetlabs-concat \ puppetlabs-firewall \ puppet-galera \ @@ -17,6 +19,7 @@ if [ "$DIB_INSTALLTYPE_puppet_modules" = "source" ]; then puppet-heat \ puppet-horizon \ puppetlabs-inifile \ + puppet-kafka \ puppet-keystone \ puppet-memcached \ puppetlabs-mongodb \ @@ -40,6 +43,7 @@ if [ "$DIB_INSTALLTYPE_puppet_modules" = "source" ]; then puppet-vlan \ puppet-vswitch \ puppetlabs-xinetd \ + puppet-zookeeper \ puppet-openstacklib \ puppet-module-keepalived \ puppetlabs-ntp \ diff --git a/elements/puppet-modules/source-repository-puppet-modules b/elements/puppet-modules/source-repository-puppet-modules index fb1158a5..c190d12f 100644 --- a/elements/puppet-modules/source-repository-puppet-modules +++ b/elements/puppet-modules/source-repository-puppet-modules @@ -1,9 +1,11 @@ puppetlabs-apache git /opt/stack/puppet-modules/apache https://github.com/puppetlabs/puppetlabs-apache.git +puppet-cassandra git /opt/stack/puppet-modules/cassandra https://github.com/locp/cassandra.git puppet-ceph git /opt/stack/puppet-modules/ceph https://git.openstack.org/stackforge/puppet-ceph.git puppet-ceilometer git /opt/stack/puppet-modules/ceilometer https://git.openstack.org/openstack/puppet-ceilometer.git puppet-certmonger git /opt/stack/puppet-modules/certmonger https://github.com/rcritten/puppet-certmonger.git puppet-cinder git /opt/stack/puppet-modules/cinder https://git.openstack.org/openstack/puppet-cinder.git puppet-common git /opt/stack/puppet-modules/common https://github.com/purpleidea/puppet-common.git +puppet-contrail git /opt/stack/puppet-modules/contrail https://github.com/redhat-cip/puppet-contrail.git puppetlabs-concat git /opt/stack/puppet-modules/concat https://github.com/puppetlabs/puppetlabs-concat.git puppetlabs-firewall git /opt/stack/puppet-modules/firewall https://github.com/puppetlabs/puppetlabs-firewall.git puppet-glance git /opt/stack/puppet-modules/glance https://git.openstack.org/openstack/puppet-glance.git @@ -12,6 +14,7 @@ puppetlabs-haproxy git /opt/stack/puppet-modules/haproxy https://github.com/pupp puppet-heat git /opt/stack/puppet-modules/heat https://git.openstack.org/openstack/puppet-heat.git puppet-horizon git /opt/stack/puppet-modules/horizon https://git.openstack.org/openstack/puppet-horizon.git puppetlabs-inifile git /opt/stack/puppet-modules/inifile https://github.com/puppetlabs/puppetlabs-inifile.git +puppet-kakfa git /opt/stack/puppet-modules/kakfa https://github.com/puppet-community/puppet-kafka.git puppet-keystone git /opt/stack/puppet-modules/keystone https://git.openstack.org/openstack/puppet-keystone.git puppet-manila git /opt/stack/puppet-modules/manila https://git.openstack.org/openstack/puppet-manila.git puppet-memcached git /opt/stack/puppet-modules/memcached https://github.com/saz/puppet-memcached.git @@ -36,6 +39,7 @@ puppetlabs-vcsrepo git /opt/stack/puppet-modules/vcsrepo https://github.com/pupp puppet-vlan git /opt/stack/puppet-modules/vlan https://github.com/derekhiggins/puppet-vlan.git puppet-vswitch git /opt/stack/puppet-modules/vswitch https://git.openstack.org/openstack/puppet-vswitch.git puppetlabs-xinetd git /opt/stack/puppet-modules/xinetd https://github.com/puppetlabs/puppetlabs-xinetd.git +puppet-zookeeper git /opt/stack/puppet-modules/zookeeper https://github.com/miguno/puppet-zookeeper.git puppet-openstacklib git /opt/stack/puppet-modules/openstacklib https://git.openstack.org/openstack/puppet-openstacklib.git puppet-module-keepalived git /opt/stack/puppet-modules/keepalived https://github.com/Unyonsys/puppet-module-keepalived.git puppetlabs-ntp git /opt/stack/puppet-modules/ntp https://github.com/puppetlabs/puppetlabs-ntp.git