From c7f37d6efc570071e4733035a573b464e6b0d3b3 Mon Sep 17 00:00:00 2001 From: Jimmy McCrory Date: Mon, 26 Jan 2015 19:55:52 -0800 Subject: [PATCH] Store all package repo URLs in variables This change stores the URL of each package repo in a variable to allow for them to be overridable through user configuration. Change-Id: I2e25029dab4969181a4481af68ed802414e8d5c1 Closes-Bug: 1414880 --- rpc_deployment/inventory/group_vars/all.yml | 16 +++++++++++++--- .../vars/repo_packages/elasticsearch.yml | 2 +- rpc_deployment/vars/repo_packages/hosts.yml | 2 +- rpc_deployment/vars/repo_packages/logstash.yml | 2 +- rpc_deployment/vars/repo_packages/rabbitmq.yml | 2 +- .../vars/repo_packages/raxmon_agent.yml | 2 +- rpc_deployment/vars/repo_packages/rsyslog.yml | 2 +- 7 files changed, 19 insertions(+), 9 deletions(-) diff --git a/rpc_deployment/inventory/group_vars/all.yml b/rpc_deployment/inventory/group_vars/all.yml index 76c61d6471..38fd7c3f04 100644 --- a/rpc_deployment/inventory/group_vars/all.yml +++ b/rpc_deployment/inventory/group_vars/all.yml @@ -43,6 +43,16 @@ external_vip_address: "{{ external_lb_vip_address }}" rpc_repo_url: "https://mirror.rackspace.com/rackspaceprivatecloud" rpc_release: master +## URLs for package repos +mariadb_repo_url: "http://mirror.rackspace.com/rackspaceprivatecloud/mirror/mariadb/mariadb-5.5.41/repo/ubuntu/" +ubuntu_lxc_repo_url: "ppa:ubuntu-lxc/stable" +elasticsearch_repo_url: "http://packages.elasticsearch.org/elasticsearch/1.2/debian" +logstash_repo_url: "http://packages.elasticsearch.org/logstash/1.4/debian" +rabbitmq_repo_url: "http://www.rabbitmq.com/debian/" +rsyslog_repo_url: "ppa:adiscon/v8-stable" +raxmon_repo_url: "http://stable.packages.cloudmonitoring.rackspace.com/ubuntu-14.04-x86_64" + + ## GPG Keys gpg_keys: - { key_name: 'mariadb', keyserver: 'hkp://keyserver.ubuntu.com:80', hash_id: '0xcbcb082a1bb943db' } @@ -50,12 +60,12 @@ gpg_keys: ## Repositories apt_common_repos: - - { repo: "deb http://mirror.rackspace.com/rackspaceprivatecloud/mirror/mariadb/mariadb-5.5.41/repo/ubuntu/ {{ ansible_distribution_release }} main", state: "present" } + - { repo: "deb {{ mariadb_repo_url }} {{ ansible_distribution_release }} main", state: "present" } apt_lxc_common_repos: - - { repo: "ppa:ubuntu-lxc/stable", state: "present" } + - { repo: "{{ ubuntu_lxc_repo_url }}", state: "present" } -get_pip_url: "https://mirror.rackspace.com/rackspaceprivatecloud/downloads/get-pip.py" +get_pip_url: "{{ rpc_repo_url }}/downloads/get-pip.py" ## Users that will not be created via container_common diff --git a/rpc_deployment/vars/repo_packages/elasticsearch.yml b/rpc_deployment/vars/repo_packages/elasticsearch.yml index c7998a2f29..4f02b06b9c 100644 --- a/rpc_deployment/vars/repo_packages/elasticsearch.yml +++ b/rpc_deployment/vars/repo_packages/elasticsearch.yml @@ -19,7 +19,7 @@ apt_container_keys: - { url: "http://packages.elasticsearch.org/GPG-KEY-elasticsearch", state: "present" } apt_container_repos: - - { repo: "deb http://packages.elasticsearch.org/elasticsearch/1.2/debian stable main", state: "present"} + - { repo: "deb {{ elasticsearch_repo_url }} stable main", state: "present"} container_packages: - elasticsearch diff --git a/rpc_deployment/vars/repo_packages/hosts.yml b/rpc_deployment/vars/repo_packages/hosts.yml index a2aaf6ec29..97195f0efa 100644 --- a/rpc_deployment/vars/repo_packages/hosts.yml +++ b/rpc_deployment/vars/repo_packages/hosts.yml @@ -14,7 +14,7 @@ # limitations under the License. apt_host_repos: - - { repo: "ppa:ubuntu-lxc/stable", state: "present" } + - { repo: "{{ ubuntu_lxc_repo_url }}", state: "present" } host_packages: - sysstat diff --git a/rpc_deployment/vars/repo_packages/logstash.yml b/rpc_deployment/vars/repo_packages/logstash.yml index 55eca37396..e5a54f5881 100644 --- a/rpc_deployment/vars/repo_packages/logstash.yml +++ b/rpc_deployment/vars/repo_packages/logstash.yml @@ -20,7 +20,7 @@ apt_container_keys: - { url: "http://packages.elasticsearch.org/GPG-KEY-elasticsearch", state: "present" } apt_container_repos: - - { repo: "deb http://packages.elasticsearch.org/logstash/1.4/debian stable main", state: "present"} + - { repo: "deb {{ logstash_repo_url }} stable main", state: "present"} container_packages: - logstash diff --git a/rpc_deployment/vars/repo_packages/rabbitmq.yml b/rpc_deployment/vars/repo_packages/rabbitmq.yml index 208faeba61..f698934a44 100644 --- a/rpc_deployment/vars/repo_packages/rabbitmq.yml +++ b/rpc_deployment/vars/repo_packages/rabbitmq.yml @@ -19,7 +19,7 @@ apt_container_keys: - { url: "http://www.rabbitmq.com/rabbitmq-signing-key-public.asc", state: "present" } apt_container_repos: - - { repo: "deb http://www.rabbitmq.com/debian/ testing main", state: "present" } + - { repo: "deb {{ rabbitmq_repo_url }} testing main", state: "present" } container_packages: - rabbitmq-server diff --git a/rpc_deployment/vars/repo_packages/raxmon_agent.yml b/rpc_deployment/vars/repo_packages/raxmon_agent.yml index c6bb33043e..9a6cf090f4 100644 --- a/rpc_deployment/vars/repo_packages/raxmon_agent.yml +++ b/rpc_deployment/vars/repo_packages/raxmon_agent.yml @@ -17,7 +17,7 @@ apt_container_keys: - { url: "https://monitoring.api.rackspacecloud.com/pki/agent/linux.asc", state: "present" } apt_container_repos: - - { repo: "deb http://stable.packages.cloudmonitoring.rackspace.com/ubuntu-14.04-x86_64 cloudmonitoring main", state: "present" } + - { repo: "deb {{ raxmon_repo_url }} cloudmonitoring main", state: "present" } container_packages: - rackspace-monitoring-agent diff --git a/rpc_deployment/vars/repo_packages/rsyslog.yml b/rpc_deployment/vars/repo_packages/rsyslog.yml index d666e4cc0b..a5d1f682a7 100644 --- a/rpc_deployment/vars/repo_packages/rsyslog.yml +++ b/rpc_deployment/vars/repo_packages/rsyslog.yml @@ -16,7 +16,7 @@ repo_package_name: rsyslog apt_container_repos: - - { repo: "ppa:adiscon/v8-stable", state: "present" } + - { repo: "{{ rsyslog_repo_url }}", state: "present" } service_pip_dependencies: - python-memcached