diff options
author | baigk <baiguoku@huawei.com> | 2015-09-19 11:07:44 +0800 |
---|---|---|
committer | baigk <baiguoku@huawei.com> | 2015-09-19 16:57:18 +0800 |
commit | 95e055a4582070548cb1632934fa18af7be76ced (patch) | |
tree | 5e93d728bc3dc2e12d4794978ebf0fad477ac76f /deploy/adapters | |
parent | 952e99a21501899b5e2615443fd1518b9d316b2e (diff) |
support to assign ppa name when deploy openstack
JIRA: COMPASS-63
Change-Id: Ifdaa8a82e849291c1b5d5a48f9f678f5bb417a89
Signed-off-by: baigk <baiguoku@huawei.com>
Diffstat (limited to 'deploy/adapters')
-rw-r--r-- | deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml (renamed from deploy/adapters/ansible/openstack_juno/HA-ansible-multinodes.yml) | 0 | ||||
-rw-r--r-- | deploy/adapters/ansible/openstack/allinone.yml (renamed from deploy/adapters/ansible/openstack_juno/allinone.yml) | 0 | ||||
-rw-r--r-- | deploy/adapters/ansible/openstack/compute.yml (renamed from deploy/adapters/ansible/openstack_juno/compute.yml) | 0 | ||||
-rw-r--r-- | deploy/adapters/ansible/openstack/controller.yml (renamed from deploy/adapters/ansible/openstack_juno/controller.yml) | 0 | ||||
-rw-r--r-- | deploy/adapters/ansible/openstack/group_vars/all (renamed from deploy/adapters/ansible/openstack_juno/group_vars/all) | 0 | ||||
-rw-r--r-- | deploy/adapters/ansible/openstack/multinodes.yml (renamed from deploy/adapters/ansible/openstack_juno/multinodes.yml) | 0 | ||||
-rw-r--r-- | deploy/adapters/ansible/openstack/network.yml (renamed from deploy/adapters/ansible/openstack_juno/network.yml) | 0 | ||||
-rw-r--r-- | deploy/adapters/ansible/openstack/single-controller.yml (renamed from deploy/adapters/ansible/openstack_juno/single-controller.yml) | 0 | ||||
-rw-r--r-- | deploy/adapters/ansible/openstack/storage.yml (renamed from deploy/adapters/ansible/openstack_juno/storage.yml) | 0 | ||||
-rw-r--r-- | deploy/adapters/ansible/openstack/templates/dnsmasq-neutron.conf (renamed from deploy/adapters/ansible/openstack_juno/templates/dnsmasq-neutron.conf) | 0 | ||||
-rw-r--r-- | deploy/adapters/ansible/openstack/templates/ml2_conf.ini (renamed from deploy/adapters/ansible/openstack_juno/templates/ml2_conf.ini) | 0 | ||||
-rw-r--r-- | deploy/adapters/ansible/openstack/templates/neutron-network.conf (renamed from deploy/adapters/ansible/openstack_juno/templates/neutron-network.conf) | 0 | ||||
-rw-r--r-- | deploy/adapters/ansible/openstack/templates/neutron.conf (renamed from deploy/adapters/ansible/openstack_juno/templates/neutron.conf) | 0 | ||||
-rw-r--r-- | deploy/adapters/ansible/openstack/templates/nova.conf (renamed from deploy/adapters/ansible/openstack_juno/templates/nova.conf) | 0 | ||||
-rw-r--r-- | deploy/adapters/ansible/roles/ha/templates/haproxy.cfg | 2 |
15 files changed, 1 insertions, 1 deletions
diff --git a/deploy/adapters/ansible/openstack_juno/HA-ansible-multinodes.yml b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml index 692650b5..692650b5 100644 --- a/deploy/adapters/ansible/openstack_juno/HA-ansible-multinodes.yml +++ b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml diff --git a/deploy/adapters/ansible/openstack_juno/allinone.yml b/deploy/adapters/ansible/openstack/allinone.yml index 4539e5fb..4539e5fb 100644 --- a/deploy/adapters/ansible/openstack_juno/allinone.yml +++ b/deploy/adapters/ansible/openstack/allinone.yml diff --git a/deploy/adapters/ansible/openstack_juno/compute.yml b/deploy/adapters/ansible/openstack/compute.yml index 8f6100ca..8f6100ca 100644 --- a/deploy/adapters/ansible/openstack_juno/compute.yml +++ b/deploy/adapters/ansible/openstack/compute.yml diff --git a/deploy/adapters/ansible/openstack_juno/controller.yml b/deploy/adapters/ansible/openstack/controller.yml index 0269281e..0269281e 100644 --- a/deploy/adapters/ansible/openstack_juno/controller.yml +++ b/deploy/adapters/ansible/openstack/controller.yml diff --git a/deploy/adapters/ansible/openstack_juno/group_vars/all b/deploy/adapters/ansible/openstack/group_vars/all index 5643fcd9..5643fcd9 100644 --- a/deploy/adapters/ansible/openstack_juno/group_vars/all +++ b/deploy/adapters/ansible/openstack/group_vars/all diff --git a/deploy/adapters/ansible/openstack_juno/multinodes.yml b/deploy/adapters/ansible/openstack/multinodes.yml index 5b43a696..5b43a696 100644 --- a/deploy/adapters/ansible/openstack_juno/multinodes.yml +++ b/deploy/adapters/ansible/openstack/multinodes.yml diff --git a/deploy/adapters/ansible/openstack_juno/network.yml b/deploy/adapters/ansible/openstack/network.yml index 77752e45..77752e45 100644 --- a/deploy/adapters/ansible/openstack_juno/network.yml +++ b/deploy/adapters/ansible/openstack/network.yml diff --git a/deploy/adapters/ansible/openstack_juno/single-controller.yml b/deploy/adapters/ansible/openstack/single-controller.yml index 96ec0a6a..96ec0a6a 100644 --- a/deploy/adapters/ansible/openstack_juno/single-controller.yml +++ b/deploy/adapters/ansible/openstack/single-controller.yml diff --git a/deploy/adapters/ansible/openstack_juno/storage.yml b/deploy/adapters/ansible/openstack/storage.yml index f0be1381..f0be1381 100644 --- a/deploy/adapters/ansible/openstack_juno/storage.yml +++ b/deploy/adapters/ansible/openstack/storage.yml diff --git a/deploy/adapters/ansible/openstack_juno/templates/dnsmasq-neutron.conf b/deploy/adapters/ansible/openstack/templates/dnsmasq-neutron.conf index 7bcbd9df..7bcbd9df 100644 --- a/deploy/adapters/ansible/openstack_juno/templates/dnsmasq-neutron.conf +++ b/deploy/adapters/ansible/openstack/templates/dnsmasq-neutron.conf diff --git a/deploy/adapters/ansible/openstack_juno/templates/ml2_conf.ini b/deploy/adapters/ansible/openstack/templates/ml2_conf.ini index 7b3e76da..7b3e76da 100644 --- a/deploy/adapters/ansible/openstack_juno/templates/ml2_conf.ini +++ b/deploy/adapters/ansible/openstack/templates/ml2_conf.ini diff --git a/deploy/adapters/ansible/openstack_juno/templates/neutron-network.conf b/deploy/adapters/ansible/openstack/templates/neutron-network.conf index 63ac27ee..63ac27ee 100644 --- a/deploy/adapters/ansible/openstack_juno/templates/neutron-network.conf +++ b/deploy/adapters/ansible/openstack/templates/neutron-network.conf diff --git a/deploy/adapters/ansible/openstack_juno/templates/neutron.conf b/deploy/adapters/ansible/openstack/templates/neutron.conf index 8a5e76ee..8a5e76ee 100644 --- a/deploy/adapters/ansible/openstack_juno/templates/neutron.conf +++ b/deploy/adapters/ansible/openstack/templates/neutron.conf diff --git a/deploy/adapters/ansible/openstack_juno/templates/nova.conf b/deploy/adapters/ansible/openstack/templates/nova.conf index 559a6d82..559a6d82 100644 --- a/deploy/adapters/ansible/openstack_juno/templates/nova.conf +++ b/deploy/adapters/ansible/openstack/templates/nova.conf diff --git a/deploy/adapters/ansible/roles/ha/templates/haproxy.cfg b/deploy/adapters/ansible/roles/ha/templates/haproxy.cfg index 3c18d362..f1a2312c 100644 --- a/deploy/adapters/ansible/roles/ha/templates/haproxy.cfg +++ b/deploy/adapters/ansible/roles/ha/templates/haproxy.cfg @@ -6,7 +6,7 @@ global group haproxy maxconn 4000 pidfile /var/run/haproxy/haproxy.pid - log 127.0.0.1 local0 + #log 127.0.0.1 local0 tune.bufsize 1000000 stats socket /var/run/haproxy.sock stats timeout 2m |