diff options
author | liyuenan <liyuenan@huawei.com> | 2016-12-19 11:06:36 +0800 |
---|---|---|
committer | liyuenan <liyuenan@huawei.com> | 2016-12-20 15:05:03 +0800 |
commit | 819912d0379f6cd2b2693c2968576f7514a117c5 (patch) | |
tree | e24d274484fa1ec8976c9f1bd44f5ee6e445724b /deploy/adapters/ansible/openstack_osp9/roles/common/templates | |
parent | eb5dbdac42b1b7b775fbc1dc513376425a6898ff (diff) |
master only support newton
JIRA: COMPASS-513
Remove other roles and ppa, master only support newton.
Change-Id: I47ddb16baa25902c3e05cc7f9d0d6430f5dc7e00
Signed-off-by: liyuenan <liyuenan@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/openstack_osp9/roles/common/templates')
4 files changed, 0 insertions, 73 deletions
diff --git a/deploy/adapters/ansible/openstack_osp9/roles/common/templates/hosts b/deploy/adapters/ansible/openstack_osp9/roles/common/templates/hosts deleted file mode 100755 index 6f76de51..00000000 --- a/deploy/adapters/ansible/openstack_osp9/roles/common/templates/hosts +++ /dev/null @@ -1,7 +0,0 @@ - -# localhost -127.0.0.1 localhost -# controller -172.16.1.1 host1 -# compute -172.16.1.1 host1 diff --git a/deploy/adapters/ansible/openstack_osp9/roles/common/templates/ntp.conf b/deploy/adapters/ansible/openstack_osp9/roles/common/templates/ntp.conf deleted file mode 100755 index 2d560be2..00000000 --- a/deploy/adapters/ansible/openstack_osp9/roles/common/templates/ntp.conf +++ /dev/null @@ -1,54 +0,0 @@ -# /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help - -driftfile /var/lib/ntp/ntp.drift - - -# Enable this if you want statistics to be logged. -#statsdir /var/log/ntpstats/ - -statistics loopstats peerstats clockstats -filegen loopstats file loopstats type day enable -filegen peerstats file peerstats type day enable -filegen clockstats file clockstats type day enable - -# Specify one or more NTP servers. - -# Use servers from the NTP Pool Project. Approved by Ubuntu Technical Board -# on 2011-02-08 (LP: #104525). See http://www.pool.ntp.org/join.html for -# more information. -server {{ ntp_server }} -server {{ internal_vip.ip }} - -# Use local server as a fallback. -server 127.127.1.0 # local clock -fudge 127.127.1.0 stratum 10 - -# Access control configuration; see /usr/share/doc/ntp-doc/html/accopt.html for -# details. The web page <http://support.ntp.org/bin/view/Support/AccessRestrictions> -# might also be helpful. -# -# Note that "restrict" applies to both servers and clients, so a configuration -# that might be intended to block requests from certain clients could also end -# up blocking replies from your own upstream servers. - -# By default, exchange time with everybody, but don't allow configuration. -restrict -4 default kod notrap nomodify -restrict -6 default kod notrap nomodify - -# Local users may interrogate the ntp server more closely. -restrict 127.0.0.1 -restrict ::1 - -# Clients from this (example!) subnet have unlimited access, but only if -# cryptographically authenticated. -#restrict 192.168.123.0 mask 255.255.255.0 notrust - - -# If you want to provide time to your local subnet, change the next line. -# (Again, the address is an example only.) -#broadcast 192.168.123.255 - -# If you want to listen to time broadcasts on your local subnet, de-comment the -# next lines. Please do this only if you trust everybody on the network! -#disable auth -#broadcastclient diff --git a/deploy/adapters/ansible/openstack_osp9/roles/common/templates/openstack_ppa_repo.repo.j2 b/deploy/adapters/ansible/openstack_osp9/roles/common/templates/openstack_ppa_repo.repo.j2 deleted file mode 100644 index 148f3e14..00000000 --- a/deploy/adapters/ansible/openstack_osp9/roles/common/templates/openstack_ppa_repo.repo.j2 +++ /dev/null @@ -1,7 +0,0 @@ -[openstack_ppa_repo] -name=rhel - openstack_repo -proxy=_none_ -baseurl=http://{{ COMPASS_SERVER.stdout_lines[0] }}/cblr/repo_mirror/redhat7-osp9-ppa -enabled=1 -gpgcheck=0 -skip_if_unavailable=1 diff --git a/deploy/adapters/ansible/openstack_osp9/roles/common/templates/pip.conf b/deploy/adapters/ansible/openstack_osp9/roles/common/templates/pip.conf deleted file mode 100755 index 7bb3e43e..00000000 --- a/deploy/adapters/ansible/openstack_osp9/roles/common/templates/pip.conf +++ /dev/null @@ -1,5 +0,0 @@ -[global] -find-links = http://{{ COMPASS_SERVER.stdout_lines[0] }}/pip -no-index = true -[install] -trusted-host={{ COMPASS_SERVER.stdout_lines[0] }} |