summaryrefslogtreecommitdiffstats
path: root/xci/installer
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2018-04-26 13:49:47 +0100
committerMarkos Chandras <mchandras@suse.de>2018-04-27 00:03:04 +0100
commitbe67faf1cfaeb2f0d1ff73c90c8b3996b2b6a506 (patch)
tree219859ab5ea8ed49a68fbf5e889a9df63ad3b50a /xci/installer
parent065c8f8300970ae0fc5a9e8bddb35ea4bc5af64f (diff)
xci: Add XCI OSA variables file
We can use an XCI specific YAML file to add OSA options which are common across flavors. Right now, it only overrides the default openSUSE mirror to use a more stable one. Change-Id: Iae7d542787ead33be1e64cdeda60761aa401cfde Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'xci/installer')
-rw-r--r--xci/installer/osa/files/user_variables_xci.yml17
-rw-r--r--xci/installer/osa/playbooks/configure-opnfvhost.yml1
2 files changed, 18 insertions, 0 deletions
diff --git a/xci/installer/osa/files/user_variables_xci.yml b/xci/installer/osa/files/user_variables_xci.yml
new file mode 100644
index 00000000..65e09bb4
--- /dev/null
+++ b/xci/installer/osa/files/user_variables_xci.yml
@@ -0,0 +1,17 @@
+---
+# Copyright 2018, SUSE LINUX GmbH
+#
+# 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.
+
+opensuse_mirror_obs: "http://ftp.gwdg.de/pub/opensuse"
+opensuse_mirror: "http://mirrors.rit.edu/opensuse"
diff --git a/xci/installer/osa/playbooks/configure-opnfvhost.yml b/xci/installer/osa/playbooks/configure-opnfvhost.yml
index 96bd9e5e..cca3e423 100644
--- a/xci/installer/osa/playbooks/configure-opnfvhost.yml
+++ b/xci/installer/osa/playbooks/configure-opnfvhost.yml
@@ -81,6 +81,7 @@
- { src: "{{ remote_xci_flavor_files }}/user_ceph.yml", dest: "{{ openstack_osa_etc_path }}/user_ceph.yml", cond: xci_ceph_enabled }
- { src: "{{ remote_xci_flavor_files }}/user_variables_ceph.yml", dest: "{{ openstack_osa_etc_path }}/user_variables_ceph.yml", cond: xci_ceph_enabled }
- { src: "{{ remote_xci_path }}/xci/installer/osa/files/cinder.yml", dest: "{{ openstack_osa_etc_path }}/env.d" }
+ - { src: "{{ remote_xci_path }}/xci/installer/osa/files/user_variables_xci.yml", dest: "{{ openstack_osa_etc_path }}/user_variables_xci.yml" }
- { src: "{{ remote_xci_path }}/xci/installer/osa/files/user_variables_proxy.yml", dest: "{{ openstack_osa_etc_path }}/user_variables_proxy.yml", cond: "{{ lookup('env', 'http_proxy') != '' }}" }
- { src: "{{ remote_xci_path }}/xci/installer/osa/files/setup-openstack.yml", dest: "{{ openstack_osa_path }}/playbooks" }
- { src: "{{ remote_xci_path }}/xci/installer/osa/files/ansible-role-requirements.yml", dest: "{{openstack_osa_path}}/ansible-role-requirements.yml", cond: "{{ openstack_osa_version != 'master' }}" }