diff --git a/README.rst b/README.rst index 57b5d8f..365a4b5 100644 --- a/README.rst +++ b/README.rst @@ -10,6 +10,19 @@ This role will install the following Upstart services: * sahara-api * sahara-engine +Required Variables +================== + +.. code-block:: yaml + + sahara_galera_address + sahara_container_mysql_password + sahara_service_password + sahara_rabbitmq_password + +Example Playbook +================ + .. code-block:: yaml - name: Install sahara server @@ -21,3 +34,6 @@ This role will install the following Upstart services: external_lb_vip_address: 172.16.24.1 internal_lb_vip_address: 192.168.0.1 sahara_galera_address: "{{ internal_lb_vip_address }}" + sahara_container_mysql_password: "SuperSecretePassword1" + sahara_service_password: "SuperSecretePassword2" + sahara_rabbitmq_password: "SuperSecretePassword3" diff --git a/defaults/main.yml b/defaults/main.yml index 03eab8f..b749a35 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,6 +1,4 @@ --- -# Copyright 2014, Rackspace US, 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 @@ -17,11 +15,6 @@ debug: False verbose: True -sahara-dashboard_git_repo: https://git.openstack.org/openstack/sahara-dashboard -sahara-dashboard_git_install_branch: stable/mitaka -sahara-dashboard_requirements_git_repo: https://git.openstack.org/openstack/requirements -sahara_requirements_git_install_branch: stable/mitaka - sahara_git_repo: https://git.openstack.org/openstack/sahara sahara_git_install_branch: stable/mitaka sahara_requirements_git_repo: https://git.openstack.org/openstack/requirements diff --git a/handlers/main.yml b/handlers/main.yml index 7734e2a..9718c61 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,6 +1,4 @@ --- -# Copyright 2014, Rackspace US, 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 diff --git a/tasks/main.yml b/tasks/main.yml index 33c08b3..0b4a373 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,4 +1,16 @@ --- +# 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. + - name: Gather variables for each operating system include_vars: "{{ item }}" with_first_found: diff --git a/tasks/sahara_db_setup.yml b/tasks/sahara_db_setup.yml index b632a02..621ba61 100644 --- a/tasks/sahara_db_setup.yml +++ b/tasks/sahara_db_setup.yml @@ -1,4 +1,16 @@ --- +# 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. + - name: Create DB for service mysql_db: login_user: "{{ galera_root_user }}" diff --git a/tasks/sahara_install.yml b/tasks/sahara_install.yml index 9778841..cf24132 100644 --- a/tasks/sahara_install.yml +++ b/tasks/sahara_install.yml @@ -1,4 +1,16 @@ --- +# 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: sahara_install_apt.yml when: - ansible_pkg_mgr == 'apt' diff --git a/tasks/sahara_install_apt.yml b/tasks/sahara_install_apt.yml index 4b3ba25..331b915 100644 --- a/tasks/sahara_install_apt.yml +++ b/tasks/sahara_install_apt.yml @@ -1,3 +1,15 @@ +# 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. + #TODO(evrardjp): Replace the next 2 tasks by a standard apt with cache #when https://github.com/ansible/ansible-modules-core/pull/1517 is merged #in 1.9.x or we move to 2.0 (if tested working) diff --git a/tasks/sahara_post_install.yml b/tasks/sahara_post_install.yml index 34f1df0..2546484 100644 --- a/tasks/sahara_post_install.yml +++ b/tasks/sahara_post_install.yml @@ -1,4 +1,16 @@ --- +# 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. + - name: Drop Sahara Config(s) config_template: src: "{{ item.src }}" diff --git a/tasks/sahara_pre_install.yml b/tasks/sahara_pre_install.yml index 85a657a..fe692ec 100644 --- a/tasks/sahara_pre_install.yml +++ b/tasks/sahara_pre_install.yml @@ -1,4 +1,16 @@ --- +# 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. + - name: create the system group group: name: "{{ sahara_system_group_name }}" diff --git a/tasks/sahara_service_setup.yml b/tasks/sahara_service_setup.yml index 3eca9a2..477c389 100644 --- a/tasks/sahara_service_setup.yml +++ b/tasks/sahara_service_setup.yml @@ -1,4 +1,16 @@ --- +# 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. + # Create a service - name: Ensure sahara service keystone: diff --git a/tasks/sahara_upstart_common_init.yml b/tasks/sahara_upstart_common_init.yml index d1077f0..e4bdf2c 100644 --- a/tasks/sahara_upstart_common_init.yml +++ b/tasks/sahara_upstart_common_init.yml @@ -1,4 +1,16 @@ --- +# 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. + - name: Place the init script template: src: "sahara-upstart-init.j2" diff --git a/tasks/sahara_upstart_init.yml b/tasks/sahara_upstart_init.yml index 4670c0e..db5bae5 100644 --- a/tasks/sahara_upstart_init.yml +++ b/tasks/sahara_upstart_init.yml @@ -1,4 +1,16 @@ --- +# 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: sahara_upstart_common_init.yml vars: program_name: "{{ sahara_api_program_name }}" diff --git a/tests/test-install-sahara.yml b/tests/test-install-sahara.yml index 8e4ab92..765b0d1 100644 --- a/tests/test-install-sahara.yml +++ b/tests/test-install-sahara.yml @@ -1,6 +1,4 @@ --- -# Copyright 2015, Rackspace US, 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 diff --git a/tests/test-sahara-functional.yml b/tests/test-sahara-functional.yml index 76bbb29..78f35cc 100644 --- a/tests/test-sahara-functional.yml +++ b/tests/test-sahara-functional.yml @@ -1,6 +1,4 @@ --- -# Copyright 2015, Rackspace US, 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 diff --git a/tests/test.yml b/tests/test.yml index 6876027..4aa3c03 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -28,5 +28,5 @@ # Install Keystone - include: test-install-keystone.yml -# Install Glance +# Install Sahara - include: test-install-sahara.yml