diff --git a/deployment_scripts/puppet/manifests/controller.pp b/deployment_scripts/puppet/manifests/controller.pp index 678e982..6b971eb 100644 --- a/deployment_scripts/puppet/manifests/controller.pp +++ b/deployment_scripts/puppet/manifests/controller.pp @@ -1,3 +1,16 @@ +# Copyright 2015 Mirantis, Inc. +# +# 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. $primary_controller = false diff --git a/deployment_scripts/puppet/manifests/primary-controller.pp b/deployment_scripts/puppet/manifests/primary-controller.pp index e2b027e..1c94c57 100644 --- a/deployment_scripts/puppet/manifests/primary-controller.pp +++ b/deployment_scripts/puppet/manifests/primary-controller.pp @@ -1,3 +1,16 @@ +# Copyright 2015 Mirantis, Inc. +# +# 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. $primary_controller = true diff --git a/deployment_scripts/puppet/modules/vpnaas/files/q-agent-cleanup.py b/deployment_scripts/puppet/modules/vpnaas/files/q-agent-cleanup.py index 093c3d4..97fc3a8 100644 --- a/deployment_scripts/puppet/modules/vpnaas/files/q-agent-cleanup.py +++ b/deployment_scripts/puppet/modules/vpnaas/files/q-agent-cleanup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2013 - 2015 Mirantis, Inc. +# Copyright 2015 Mirantis, Inc. # # 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 diff --git a/deployment_scripts/puppet/modules/vpnaas/lib/facter/check_mode.rb b/deployment_scripts/puppet/modules/vpnaas/lib/facter/check_mode.rb index eea5dc8..b866dfe 100644 --- a/deployment_scripts/puppet/modules/vpnaas/lib/facter/check_mode.rb +++ b/deployment_scripts/puppet/modules/vpnaas/lib/facter/check_mode.rb @@ -1,3 +1,17 @@ +# Copyright 2015 Mirantis, Inc. +# +# 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. + Facter.add('cluster_mode') do setcode do Facter::Util::Resolution.exec("cat /etc/astute.yaml | grep deployment_mode | awk '{print $2}'") diff --git a/deployment_scripts/puppet/modules/vpnaas/lib/puppet/provider/neutron_config/ini_setting.rb b/deployment_scripts/puppet/modules/vpnaas/lib/puppet/provider/neutron_config/ini_setting.rb index a1e97b0..b97c53d 100644 --- a/deployment_scripts/puppet/modules/vpnaas/lib/puppet/provider/neutron_config/ini_setting.rb +++ b/deployment_scripts/puppet/modules/vpnaas/lib/puppet/provider/neutron_config/ini_setting.rb @@ -1,3 +1,17 @@ +# Copyright 2015 Mirantis, Inc. +# +# 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. + Puppet::Type.type(:neutron_config).provide( :ini_setting, :parent => Puppet::Type.type(:ini_setting).provider(:ruby) diff --git a/deployment_scripts/puppet/modules/vpnaas/lib/puppet/provider/neutron_vpnaas_agent_config/ini_setting.rb b/deployment_scripts/puppet/modules/vpnaas/lib/puppet/provider/neutron_vpnaas_agent_config/ini_setting.rb index ee6b744..53f24cd 100644 --- a/deployment_scripts/puppet/modules/vpnaas/lib/puppet/provider/neutron_vpnaas_agent_config/ini_setting.rb +++ b/deployment_scripts/puppet/modules/vpnaas/lib/puppet/provider/neutron_vpnaas_agent_config/ini_setting.rb @@ -1,3 +1,17 @@ +# Copyright 2015 Mirantis, Inc. +# +# 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. + Puppet::Type.type(:neutron_vpnaas_agent_config).provide( :ini_setting, :parent => Puppet::Type.type(:ini_setting).provider(:ruby) diff --git a/deployment_scripts/puppet/modules/vpnaas/lib/puppet/type/neutron_config.rb b/deployment_scripts/puppet/modules/vpnaas/lib/puppet/type/neutron_config.rb index e83547b..a33ca20 100644 --- a/deployment_scripts/puppet/modules/vpnaas/lib/puppet/type/neutron_config.rb +++ b/deployment_scripts/puppet/modules/vpnaas/lib/puppet/type/neutron_config.rb @@ -1,3 +1,17 @@ +# Copyright 2015 Mirantis, Inc. +# +# 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. + Puppet::Type.newtype(:neutron_config) do ensurable diff --git a/deployment_scripts/puppet/modules/vpnaas/lib/puppet/type/neutron_vpnaas_agent_config.rb b/deployment_scripts/puppet/modules/vpnaas/lib/puppet/type/neutron_vpnaas_agent_config.rb index a9e082d..c617281 100644 --- a/deployment_scripts/puppet/modules/vpnaas/lib/puppet/type/neutron_vpnaas_agent_config.rb +++ b/deployment_scripts/puppet/modules/vpnaas/lib/puppet/type/neutron_vpnaas_agent_config.rb @@ -1,3 +1,17 @@ +# Copyright 2015 Mirantis, Inc. +# +# 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. + Puppet::Type.newtype(:neutron_vpnaas_agent_config) do ensurable diff --git a/deployment_scripts/puppet/modules/vpnaas/manifests/common.pp b/deployment_scripts/puppet/modules/vpnaas/manifests/common.pp index ea2a8bd..a315f28 100644 --- a/deployment_scripts/puppet/modules/vpnaas/manifests/common.pp +++ b/deployment_scripts/puppet/modules/vpnaas/manifests/common.pp @@ -1,3 +1,17 @@ +# Copyright 2015 Mirantis, Inc. +# +# 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. + #This class contains common changes both for HA and simple deployment mode. #It enables VPN in Horizon and Neutron server. diff --git a/deployment_scripts/puppet/modules/vpnaas/manifests/ha.pp b/deployment_scripts/puppet/modules/vpnaas/manifests/ha.pp index 11034af..d6f41e4 100644 --- a/deployment_scripts/puppet/modules/vpnaas/manifests/ha.pp +++ b/deployment_scripts/puppet/modules/vpnaas/manifests/ha.pp @@ -1,3 +1,17 @@ +# Copyright 2015 Mirantis, Inc. +# +# 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. + #This class is intended to deploy VPNaaS in HA mode. class vpnaas::ha { diff --git a/deployment_scripts/puppet/modules/vpnaas/manifests/init.pp b/deployment_scripts/puppet/modules/vpnaas/manifests/init.pp index bcbcbcf..74afd54 100644 --- a/deployment_scripts/puppet/modules/vpnaas/manifests/init.pp +++ b/deployment_scripts/puppet/modules/vpnaas/manifests/init.pp @@ -1,3 +1,17 @@ +# Copyright 2015 Mirantis, Inc. +# +# 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. + class vpnaas { if $cluster_mode == 'ha_compact' { diff --git a/deployment_scripts/puppet/modules/vpnaas/manifests/params.pp b/deployment_scripts/puppet/modules/vpnaas/manifests/params.pp index 0dafd48..f0ee972 100644 --- a/deployment_scripts/puppet/modules/vpnaas/manifests/params.pp +++ b/deployment_scripts/puppet/modules/vpnaas/manifests/params.pp @@ -1,3 +1,17 @@ +# Copyright 2015 Mirantis, Inc. +# +# 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. + #This class contains necessary parameters for all other manifests class vpnaas::params { diff --git a/deployment_scripts/puppet/modules/vpnaas/manifests/simple.pp b/deployment_scripts/puppet/modules/vpnaas/manifests/simple.pp index bb09d4d..5771a1d 100644 --- a/deployment_scripts/puppet/modules/vpnaas/manifests/simple.pp +++ b/deployment_scripts/puppet/modules/vpnaas/manifests/simple.pp @@ -1,3 +1,17 @@ +# Copyright 2015 Mirantis, Inc. +# +# 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. + #This class deploys VPNaaS in simple mode. class vpnaas::simple { diff --git a/deployment_scripts/puppet/modules/vpnaas/spec/classes/init_spec.rb b/deployment_scripts/puppet/modules/vpnaas/spec/classes/init_spec.rb index 9774830..9481d03 100644 --- a/deployment_scripts/puppet/modules/vpnaas/spec/classes/init_spec.rb +++ b/deployment_scripts/puppet/modules/vpnaas/spec/classes/init_spec.rb @@ -1,3 +1,17 @@ +# Copyright 2015 Mirantis, Inc. +# +# 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. + require 'spec_helper' describe 'vpnaas' do diff --git a/deployment_scripts/puppet/modules/vpnaas/spec/spec_helper.rb b/deployment_scripts/puppet/modules/vpnaas/spec/spec_helper.rb index 2c6f566..e0dccaf 100644 --- a/deployment_scripts/puppet/modules/vpnaas/spec/spec_helper.rb +++ b/deployment_scripts/puppet/modules/vpnaas/spec/spec_helper.rb @@ -1 +1,15 @@ +# Copyright 2015 Mirantis, Inc. +# +# 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. + require 'puppetlabs_spec_helper/module_spec_helper' diff --git a/deployment_scripts/puppet/modules/vpnaas/tests/init.pp b/deployment_scripts/puppet/modules/vpnaas/tests/init.pp index 7e18e5f..456c7f2 100644 --- a/deployment_scripts/puppet/modules/vpnaas/tests/init.pp +++ b/deployment_scripts/puppet/modules/vpnaas/tests/init.pp @@ -1,3 +1,17 @@ +# Copyright 2015 Mirantis, Inc. +# +# 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. + # The baseline for module testing used by Puppet Labs is that each manifest # should have a corresponding test manifest that declares that class or defined # type. diff --git a/deployment_scripts/puppet/modules/vpnaas/tests/vpnaas_ha.pp b/deployment_scripts/puppet/modules/vpnaas/tests/vpnaas_ha.pp index b706d6b..544e999 100644 --- a/deployment_scripts/puppet/modules/vpnaas/tests/vpnaas_ha.pp +++ b/deployment_scripts/puppet/modules/vpnaas/tests/vpnaas_ha.pp @@ -1 +1,15 @@ -include vpnaas::ha \ No newline at end of file +# Copyright 2015 Mirantis, Inc. +# +# 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. + +include vpnaas::ha